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: https://origsvn.digium.com/svn/asterisk/trunk@311373 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 08f655da92f07787f3207b63c768135e2deda29f..7c57171b112a5cd8c5b713ab559dc86c34d44482 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23768,7 +23768,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
                if (!authpeer || AST_LIST_EMPTY(&authpeer->mailboxes)) {
                        transmit_response(p, "404 Not found (no mailbox)", req);
                        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)
                                unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 4)");
                        return 0;

diff --git a/res/res_fax.c b/res/res_fax.c
index 785b073aebb72582ee18aaf214b26974faa4bea3..ed718aeb61912631ab38d5d238000fad063c0967 100644 (file)
--- 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 75ea729d19f1b9eb6cb69af9d9f57edcaa900126..951eb3edfa583a40e16873f5d36f85aea16a9e2c 100644 (file)
--- 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",