aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authormvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 17:52:04 +0000
committermvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 17:52:04 +0000
commit5f5c766a43f753cbf372cdfa272496363d8f6061 (patch)
tree0376526e643687eec69d4ae951d9c287ed247e21 /channels/chan_h323.c
parentc8acb343af7427f040350f7ca27fdb24e8ebaad6 (diff)
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 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@170503 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
-rw-r--r--channels/chan_h323.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index c24cbe71c..a72580400 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -1229,7 +1229,7 @@ static struct oh323_alias *realtime_alias(const char *alias)
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 @@ static struct oh323_user *realtime_user(const call_details_t *cd)
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 @@ static struct oh323_peer *realtime_peer(const char *peername, struct sockaddr_in
/* 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;