[asterisk-commits] mnicholson: trunk r308724 - in /trunk: ./ main/udptl.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Feb 24 09:10:58 2011
New Revision: 308724

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308724
Log:
Merged revisions 308723 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r308723 | mnicholson | 2011-02-24 09:06:14 -0600 (Thu, 24 Feb 2011) | 16 lines
  
  Merged revisions 308722 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r308722 | mnicholson | 2011-02-24 08:59:41 -0600 (Thu, 24 Feb 2011) | 9 lines
    
    Merged revisions 308721 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r308721 | mnicholson | 2011-02-24 08:54:56 -0600 (Thu, 24 Feb 2011) | 2 lines
      
      silence gcc 4.2 compiler warning
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/udptl.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/udptl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/udptl.c?view=diff&rev=308724&r1=308723&r2=308724
==============================================================================
--- trunk/main/udptl.c (original)
+++ trunk/main/udptl.c Thu Feb 24 09:10:58 2011
@@ -321,9 +321,9 @@
 	unsigned int count;
 	int total_count;
 	int seq_no;
-	const uint8_t *ifp;
-	const uint8_t *data;
-	unsigned int ifp_len;
+	const uint8_t *ifp = NULL;
+	const uint8_t *data = NULL;
+	unsigned int ifp_len = 0;
 	int repaired[16];
 	const uint8_t *bufs[ARRAY_LEN(s->f) - 1];
 	unsigned int lengths[ARRAY_LEN(s->f) - 1];