more NULL and "" equivalence in cid fields

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

diff --git a/manager.c b/manager.c
index 05f0e990f338ffded5ae5a9e78655399bd576dbc..033320e87741387c64331cdccd59618a41772107 100644 (file)
--- a/manager.c
+++ b/manager.c
@@ -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 */