[svn-commits] mjordan: branch oej/roibos-cng-support-1.8 r377206 - in /team/oej/roibos-cng-...

[SVN commits to the Digium repositories]

Author: mjordan
Date: Tue Dec  4 08:10:30 2012
New Revision: 377206

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377206
Log:
Fix compile warnings

This patch fixes two compiler warnings:
 * It explicitly casts format_t to its underlying type for formatting
 * It handles the new control frame subtype in the func_frame_trace switch


Modified:
    team/oej/roibos-cng-support-1.8/channels/chan_sip.c
    team/oej/roibos-cng-support-1.8/funcs/func_frame_trace.c

Modified: team/oej/roibos-cng-support-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/roibos-cng-support-1.8/channels/chan_sip.c?view=diff&rev=377206&r1=377205&r2=377206
==============================================================================
--- team/oej/roibos-cng-support-1.8/channels/chan_sip.c (original)
+++ team/oej/roibos-cng-support-1.8/channels/chan_sip.c Tue Dec  4 08:10:30 2012
@@ -11906,7 +11906,7 @@
 		/* Now add Comfort Noise and DTMF RFC2833 telephony-event as a codec */
 		for (x = 1LL; x <= AST_RTP_MAX; x <<= 1) {
 			if (!(p->jointnoncodeccapability & x)) {
-				ast_debug(1, "NOT Adding non-codec 0x%x (%s) to SDP\n", x, ast_rtp_lookup_mime_subtype2(0, x, 0));
+				ast_debug(1, "NOT Adding non-codec 0x%lx (%s) to SDP\n", (int64_t)x, ast_rtp_lookup_mime_subtype2(0, x, 0));
 				continue;
 			}
 

Modified: team/oej/roibos-cng-support-1.8/funcs/func_frame_trace.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/roibos-cng-support-1.8/funcs/func_frame_trace.c?view=diff&rev=377206&r1=377205&r2=377206
==============================================================================
--- team/oej/roibos-cng-support-1.8/funcs/func_frame_trace.c (original)
+++ team/oej/roibos-cng-support-1.8/funcs/func_frame_trace.c Tue Dec  4 08:10:30 2012
@@ -321,6 +321,9 @@
 		case AST_CONTROL_UPDATE_RTP_PEER:
 			ast_verbose("SubClass: UPDATE_RTP_PEER\n");
 			break;
+		case AST_CONTROL_CNG_END:
+			ast_verbose("SubClass: CNG_END");
+			break;
 		}
 		
 		if (frame->subclass.integer == -1) {