issue #5804
authorRussell Bryant <russell@russellbryant.com>
Mon, 21 Nov 2005 01:21:39 +0000 (01:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 21 Nov 2005 01:21:39 +0000 (01:21 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7159 65c4cc65-6c06-0410-ace0-fbb531ad65f3

ChangeLog
cli.c

index e0b6eda..17af43f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-20  Russell Bryant <russell@digium.com>
 
 2005-11-20  Russell Bryant <russell@digium.com>
 
+       * cli.c: Remove some unnecessary calls to ast_strlen_zero(). (issue #5804)
+
        * channels/chan_oss.c configs/oss.conf.sample: Add the ability to set callerid in oss.conf. 
 
        * channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794)
        * channels/chan_oss.c configs/oss.conf.sample: Add the ability to set callerid in oss.conf. 
 
        * channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794)
diff --git a/cli.c b/cli.c
index a0e80be..afba60f 100755 (executable)
--- a/cli.c
+++ b/cli.c
@@ -460,15 +460,15 @@ static int handle_chanlist(int fd, int argc, char *argv[])
                }
                if (concise) {
                        ast_cli(fd, CONCISE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state),
                }
                if (concise) {
                        ast_cli(fd, CONCISE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state),
-                               c->appl ? c->appl : "(None)", c->data ? ( !ast_strlen_zero(c->data) ? c->data : "" ): "",
-                               (c->cid.cid_num && !ast_strlen_zero(c->cid.cid_num)) ? c->cid.cid_num : "",
-                               (c->accountcode && !ast_strlen_zero(c->accountcode)) ? c->accountcode : "", c->amaflags, 
+                               c->appl ? c->appl : "(None)", c->data ? c->data : "",
+                               c->cid.cid_num ? c->cid.cid_num : "",
+                               c->accountcode ? c->accountcode : "", c->amaflags, 
                                durbuf, bc ? bc->name : "(None)");
                } else if (verbose) {
                        ast_cli(fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state),
                                c->appl ? c->appl : "(None)", c->data ? ( !ast_strlen_zero(c->data) ? c->data : "(Empty)" ): "(None)",
                                durbuf, bc ? bc->name : "(None)");
                } else if (verbose) {
                        ast_cli(fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state),
                                c->appl ? c->appl : "(None)", c->data ? ( !ast_strlen_zero(c->data) ? c->data : "(Empty)" ): "(None)",
-                               (c->cid.cid_num && !ast_strlen_zero(c->cid.cid_num)) ? c->cid.cid_num : "", durbuf,
-                               (c->accountcode && !ast_strlen_zero(c->accountcode)) ? c->accountcode : "", bc ? bc->name : "(None)");
+                               c->cid.cid_num ? c->cid.cid_num : "", durbuf,
+                               c->accountcode ? c->accountcode : "", bc ? bc->name : "(None)");
                } else {
                        if (!ast_strlen_zero(c->context) && !ast_strlen_zero(c->exten)) 
                                snprintf(locbuf, sizeof(locbuf), "%s@%s:%d", c->exten, c->context, c->priority);
                } else {
                        if (!ast_strlen_zero(c->context) && !ast_strlen_zero(c->exten)) 
                                snprintf(locbuf, sizeof(locbuf), "%s@%s:%d", c->exten, c->context, c->priority);