diff options
| author | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-18 16:24:19 +0000 |
|---|---|---|
| committer | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-18 16:24:19 +0000 |
| commit | 57b175a00b780648197ee964ef7f2f1609c2594f (patch) | |
| tree | 7b7f83ed0482c0e82804d08068c78eeee6565f59 /res | |
| parent | 7587e4d3a21db66c35562c57f261cb5542d8dfe2 (diff) | |
Merged revisions 311352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r311352 | jrose | 2011-03-18 11:19:05 -0500 (Fri, 18 Mar 2011) | 10 lines
Changes some print statements/events to use a blank string in place of NULL if the string in question is NULL.
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: http://svn.digium.com/svn/asterisk/trunk@311373 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_fax.c | 20 | ||||
| -rw-r--r-- | res/res_jabber.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index 785b073ae..ed718aeb6 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -1717,11 +1717,11 @@ static int receivefax_exec(struct ast_channel *chan, const char *data) info.context, info.exten, info.cid, - pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), - pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), - pbx_builtin_getvar_helper(chan, "FAXPAGES"), - pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), - pbx_builtin_getvar_helper(chan, "FAXBITRATE"), + S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "FAXPAGES"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "FAXBITRATE"), ""), args.filename); ast_channel_unlock(chan); @@ -2208,11 +2208,11 @@ static int sendfax_exec(struct ast_channel *chan, const char *data) info.context, info.exten, info.cid, - pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), - pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), - pbx_builtin_getvar_helper(chan, "FAXPAGES"), - pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), - pbx_builtin_getvar_helper(chan, "FAXBITRATE"), + S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "FAXPAGES"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "FAXRESOLUTION"), ""), + S_OR(pbx_builtin_getvar_helper(chan, "FAXBITRATE"), ""), filenames); ast_channel_unlock(chan); diff --git a/res/res_jabber.c b/res/res_jabber.c index 75ea729d1..951eb3edf 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -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" "\r\nDescription: %s\r\n", client->name, pak->from->partial, found->resource, found->status, - found->priority, found->description); + found->priority, S_OR(found->description, "")); } else { manager_event(EVENT_FLAG_USER, "JabberStatus", "Account: %s\r\nJID: %s\r\nStatus: %d\r\n", |