From: Luigi Rizzo <rizzo@icir.org>
Date: Fri, 21 Apr 2006 10:41:13 +0000 (+0000)
Subject: more NULL "" equivalence in CID fields.
X-Git-Tag: 1.4.0-beta1~1849
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=965ff42bedfea69b80f8370bbca5a268e0ca37ec;p=thirdparty%2Fasterisk.git

more NULL "" equivalence in CID fields.
Mark a potentially missing item in managerevent



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 99bacf0171..f4bdd112e0 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -344,6 +344,7 @@ static const char *get_cid_name(char *name, int namelen, struct ast_channel *cha
 
 static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
 {
+	/* XXX do we need also CallerIDnum ? */
 	manager_event(EVENT_FLAG_CALL, "Dial", 
 			   "Source: %s\r\n"
 			   "Destination: %s\r\n"
@@ -351,8 +352,8 @@ static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
 			   "CallerIDName: %s\r\n"
 			   "SrcUniqueID: %s\r\n"
 			   "DestUniqueID: %s\r\n",
-			   src->name, dst->name, src->cid.cid_num ? src->cid.cid_num : "<unknown>",
-			   src->cid.cid_name ? src->cid.cid_name : "<unknown>", src->uniqueid,
+			   src->name, dst->name, S_OR(src->cid.cid_num, "<unknown>"),
+			   S_OR(src->cid.cid_name, "<unknown>"), src->uniqueid,
 			   dst->uniqueid);
 }