diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-21 10:31:23 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-21 10:31:23 +0000 |
| commit | d999f912e300c3daa5a74113eb267003a1db970b (patch) | |
| tree | 97bebcda0bc7111977ca844c2f19e88e0be82647 | |
| parent | ac7e695cf866c4f0a9dd4360849685f6663f5d9f (diff) | |
more NULL and "" equivalence in cid fields
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@21816 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | manager.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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 */ |