From f91462e7caa6daa5eeec81686b1a35ebdf799f83 Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Fri, 18 Mar 2011 16:24:19 +0000 Subject: 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 --- res/res_jabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res/res_jabber.c') 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", -- cgit v1.2.3