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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jun 17 15:30:00 2008
New Revision: 123487

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123487
Log:
Merged revisions 123486 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r123486 | mmichelson | 2008-06-17 15:28:47 -0500 (Tue, 17 Jun 2008) | 12 lines

Merged revisions 123485 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123485 | mmichelson | 2008-06-17 15:26:38 -0500 (Tue, 17 Jun 2008) | 4 lines

Make chan_sip build under dev mode with compilers >= GCC 4.2
Thanks to jpeeler for alerting me of this


........

................

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=123487&r1=123486&r2=123487
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Jun 17 15:30:00 2008
@@ -15150,8 +15150,10 @@
 	int sipmethod;
 	int res = 1;
 	const char *c = get_header(req, "Cseq");
+	/* GCC 4.2 complains if I try to cast c as a char * when passing it to ast_skip_nonblanks, so make a copy of it */
+	char *c_copy = ast_strdupa(c);
 	/* Skip the Cseq and its subsequent spaces */
-	const char *msg = ast_skip_blanks(ast_skip_nonblanks((char *)c));
+	const char *msg = ast_skip_blanks(ast_skip_nonblanks(c_copy));
 
 	if (!msg)
 		msg = "";