kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

more NULL and "" equivalence in cid fields

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-21 10:31:23 +00:00
parent 309f16bd07
commit 7d9c26dfea
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manager.c
View File

@@ -1200,9 +1200,9 @@ static int action_status(struct mansession *s, struct message *m)
"%s"
"\r\n",
c->name,
c->cid.cid_num ? c->cid.cid_num : "<unknown>",
c->cid.cid_num ? c->cid.cid_num : "<unknown>",
c->cid.cid_name ? c->cid.cid_name : "<unknown>",
S_OR(c->cid.cid_num, "<unknown>"),
S_OR(c->cid.cid_num, "<unknown>"),
S_OR(c->cid.cid_name, "<unknown>"),
c->accountcode,
ast_state2str(c->_state), c->context,
c->exten, c->priority, (long)elapsed_seconds, bridge, c->uniqueid, idText);
@@ -1221,9 +1221,9 @@ static int action_status(struct mansession *s, struct message *m)
"%s"
"\r\n",
c->name,
c->cid.cid_num ? c->cid.cid_num : "<unknown>",
c->cid.cid_num ? c->cid.cid_num : "<unknown>",
c->cid.cid_name ? c->cid.cid_name : "<unknown>",
S_OR(c->cid.cid_num, "<unknown>"),
S_OR(c->cid.cid_num, "<unknown>"),
S_OR(c->cid.cid_name, "<unknown>"),
c->accountcode,
ast_state2str(c->_state), bridge, c->uniqueid, idText);
}
@@ -1356,9 +1356,9 @@ static void *fast_originate(void *data)
"CallerIDName: %s\r\n",
in->idtext, in->tech, in->data, in->context, in->exten, reason,
chan ? chan->uniqueid : "<null>",
in->cid_num ? in->cid_num : "<unknown>",
in->cid_num ? in->cid_num : "<unknown>",
in->cid_name ? in->cid_name : "<unknown>"
S_OR(in->cid_num, "<unknown>"),
S_OR(in->cid_num, "<unknown>"),
S_OR(in->cid_name, "<unknown>")
);
/* Locked by ast_pbx_outgoing_exten or ast_pbx_outgoing_app */