[asterisk-commits] oej: branch 1.6.0 r242230 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Jan 22 03:35:33 2010
New Revision: 242230

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

................
r242227 | oej | 2010-01-22 10:28:34 +0100 (Fre, 22 Jan 2010) | 11 lines

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

........
r242226 | oej | 2010-01-22 10:19:30 +0100 (Fre, 22 Jan 2010) | 3 lines

Initialize notify_types to NULL


........

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

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://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=242230&r1=242229&r2=242230
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Jan 22 03:35:33 2010
@@ -1694,7 +1694,7 @@
 static int ourport_tls;				/*!< The port used for TCP/TLS connections */
 static struct sockaddr_in debugaddr;
 
-static struct ast_config *notify_types;		/*!< The list of manual NOTIFY types we know how to send */
+static struct ast_config *notify_types = NULL;		/*!< The list of manual NOTIFY types we know how to send */
 
 /*! some list management macros. */