[asterisk-commits] mvanbaak: branch 1.6.0 r170503 - in /branches/1.6.0: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Fri Jan 23 11:52:04 2009
New Revision: 170503

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

........
  r170501 | mvanbaak | 2009-01-23 18:46:02 +0100 (Fri, 23 Jan 2009) | 1 line
  
  let's use SENTINEL^Wa correct sentinel where needed
........

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

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

Modified: branches/1.6.0/channels/chan_h323.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_h323.c?view=diff&rev=170503&r1=170502&r2=170503
==============================================================================
--- branches/1.6.0/channels/chan_h323.c (original)
+++ branches/1.6.0/channels/chan_h323.c Fri Jan 23 11:52:04 2009
@@ -1229,7 +1229,7 @@
 	struct ast_variable *var, *tmp;
 	struct oh323_alias *a;
 
-	var = ast_load_realtime("h323", "name", alias, NULL);
+	var = ast_load_realtime("h323", "name", alias, (char *)NULL);
 
 	if (!var)
 		return NULL;
@@ -1443,10 +1443,10 @@
 	const char *username;
 
 	if (userbyalias)
-		var = ast_load_realtime("h323", "name", username = cd->call_source_aliases, NULL);
+		var = ast_load_realtime("h323", "name", username = cd->call_source_aliases, (char *)NULL);
 	else {
 		username = (char *)NULL;
-		var = ast_load_realtime("h323", "host", cd->sourceIp, NULL);
+		var = ast_load_realtime("h323", "host", cd->sourceIp, (char *)NULL);
 	}
 
 	if (!var)
@@ -1559,9 +1559,9 @@
 
 	/* First check on peer name */
 	if (peername)
-		var = ast_load_realtime("h323", "name", peername, NULL);
+		var = ast_load_realtime("h323", "name", peername, (char *)NULL);
 	else if (sin) /* Then check on IP address for dynamic peers */
-		var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), NULL);
+		var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), (char *)NULL);
 	else
 		return NULL;