summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2006-04-21 10:41:13 +0000
committerLuigi Rizzo <rizzo@icir.org>2006-04-21 10:41:13 +0000
commit965ff42bedfea69b80f8370bbca5a268e0ca37ec (patch)
tree30f2cbbb4e5c64491b91f4be61220da95f687caa /apps
parentef619f6dd882f8b69f45bb81ec8e9756344ccf26 (diff)
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
Diffstat (limited to 'apps')
-rw-r--r--apps/app_dial.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 99bacf017..f4bdd112e 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);
}