[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r303550 - in /team/dvossel/f...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Jan 24 14:52:17 2011
New Revision: 303550

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303550
Log:
fixes some minor issues i found during code review

Modified:
    team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c
    team/dvossel/fixtheworld_phase1_step3/main/channel.c

Modified: team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c?view=diff&rev=303550&r1=303549&r2=303550
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c Mon Jan 24 14:52:17 2011
@@ -12171,8 +12171,10 @@
 			struct ast_format best_fmt_native;
 			res = ast_translator_best_choice(cap, c->nativeformats, &best_fmt_cap, &best_fmt_native);
 			if (res < 0) {
+				char tmp[256];
+				char tmp2[256];
 				ast_log(LOG_WARNING, "Unable to create translator path for %s to %s on %s\n",
-					ast_getformatname(&best_fmt_native), ast_getformatname(&best_fmt_cap), c->name);
+					ast_getformatname_multiple(tmp, sizeof(tmp), c->nativeformats), ast_getformatname_multiple(tmp2, sizeof(tmp2), cap), c->name);
 				ast_hangup(c);
 				return NULL;
 			}

Modified: team/dvossel/fixtheworld_phase1_step3/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/channel.c?view=diff&rev=303550&r1=303549&r2=303550
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/channel.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/channel.c Mon Jan 24 14:52:17 2011
@@ -7193,9 +7193,9 @@
 
 	o0nativeformats = ast_format_cap_copy(c0->nativeformats);
 	o1nativeformats = ast_format_cap_copy(c1->nativeformats);
-	if (!o0nativeformats || !o0nativeformats) {
+	if (!o0nativeformats || !o1nativeformats) {
 		ast_format_cap_destroy(o0nativeformats);
-		ast_format_cap_destroy(o0nativeformats);
+		ast_format_cap_destroy(o1nativeformats);
 		ast_log(LOG_WARNING, "failed to copy native formats\n");
 		return -1;
 	}
@@ -7372,7 +7372,7 @@
 				c0->_bridge = NULL;
 				c1->_bridge = NULL;
 				ast_format_cap_destroy(o0nativeformats);
-				ast_format_cap_destroy(o0nativeformats);
+				ast_format_cap_destroy(o1nativeformats);
 				return res;
 			} else {
 				ast_clear_flag(c0, AST_FLAG_NBRIDGE);
@@ -7401,7 +7401,7 @@
 				ast_log(LOG_WARNING, "Can't make %s and %s compatible\n", c0->name, c1->name);
 				manager_bridge_event(0, 1, c0, c1);
 				ast_format_cap_destroy(o0nativeformats);
-				ast_format_cap_destroy(o0nativeformats);
+				ast_format_cap_destroy(o1nativeformats);
 				return AST_BRIDGE_FAILED;
 			}