Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Changes some print statements/events to use a blank string in place of NULL if the string in question is NULL.

Browse Source 
This is supposed to improve Solaris compatibility since Solaris goes berserk when trying to output NULL strings.

(closes issue #18759)
Reported by: bklang
Patches:
      null-strings.patch uploaded by bklang (license 919)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@311352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Jonathan Rose 14 years ago
parent 87b246e421
commit 7cf95da39a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
channels/chan_sip.c
Unescape View File

@ -23453,7 +23453,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
if (!authpeer || AST_LIST_EMPTY(&authpeer->mailboxes)) { if (!authpeer || AST_LIST_EMPTY(&authpeer->mailboxes)) {
transmit_response(p, "404 Not found (no mailbox)", req); transmit_response(p, "404 Not found (no mailbox)", req);
pvt_set_needdestroy(p, "received 404 response"); pvt_set_needdestroy(p, "received 404 response");
ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", authpeer->name); ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", S_OR(authpeer->name, ""));
if (authpeer) if (authpeer)
unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 4)"); unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 4)");
return 0; return 0;

20
res/res_fax.c
Unescape View File

@ -1764,11 +1764,11 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
info.context, info.context,
info.exten, info.exten,
info.cid, info.cid,
pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""),
pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""),
pbx_builtin_getvar_helper(chan, "FAXPAGES"), S_OR(pbx_builtin_getvar_helper(chan, "FAXPAGES"), ""),
pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), S_OR(pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), ""),
pbx_builtin_getvar_helper(chan, "FAXBITRATE"), S_OR(pbx_builtin_getvar_helper(chan, "FAXBITRATE"), ""),
args.filename); args.filename);
ast_channel_unlock(chan); ast_channel_unlock(chan);
@ -2266,11 +2266,11 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
info.context, info.context,
info.exten, info.exten,
info.cid, info.cid,
pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""),
pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""),
pbx_builtin_getvar_helper(chan, "FAXPAGES"), S_OR(pbx_builtin_getvar_helper(chan, "FAXPAGES"), ""),
pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), S_OR(pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), ""),
pbx_builtin_getvar_helper(chan, "FAXBITRATE"), S_OR(pbx_builtin_getvar_helper(chan, "FAXBITRATE"), ""),
filenames); filenames);
ast_channel_unlock(chan); ast_channel_unlock(chan);

2
res/res_jabber.c
Unescape View File

@ -2490,7 +2490,7 @@ static void aji_handle_presence(struct aji_client *client, ikspak *pak)
"Account: %s\r\nJID: %s\r\nResource: %s\r\nStatus: %d\r\nPriority: %d" "Account: %s\r\nJID: %s\r\nResource: %s\r\nStatus: %d\r\nPriority: %d"
"\r\nDescription: %s\r\n", "\r\nDescription: %s\r\n",
client->name, pak->from->partial, found->resource, found->status, client->name, pak->from->partial, found->resource, found->status,
found->priority, found->description); found->priority, S_OR(found->description, ""));
} else { } else {
manager_event(EVENT_FLAG_USER, "JabberStatus", manager_event(EVENT_FLAG_USER, "JabberStatus",
"Account: %s\r\nJID: %s\r\nStatus: %d\r\n", "Account: %s\r\nJID: %s\r\nStatus: %d\r\n",

Write Preview
Loading…
Cancel
Save