[asterisk-commits] mmichelson: branch 1.6.0 r158267 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Nov 20 19:23:18 2008
New Revision: 158267

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158267
Log:
Merged revisions 158265-158266 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r158265 | mmichelson | 2008-11-20 19:14:20 -0600 (Thu, 20 Nov 2008) | 4 lines

Use some magic constants to get the right size
for this sscanf statement. Thanks Richard!


........
r158266 | mmichelson | 2008-11-20 19:22:18 -0600 (Thu, 20 Nov 2008) | 3 lines

Use a more expressive constant for a 64-bit scanned int


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=158267&r1=158266&r2=158267
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Nov 20 19:23:18 2008
@@ -6558,7 +6558,7 @@
 		ast_log(LOG_WARNING, "SDP sytax error in o= line\n");
 		return -1;
 	}
-	if (!sscanf(token, "%llu", (unsigned long long *) &rua_version)) {
+	if (!sscanf(token, "%" SCNu64, &rua_version)) {
 		ast_log(LOG_WARNING, "SDP sytax error in o= line version\n");
 		return -1;
 	}