issue #5804

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7159 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e0b6eda96..17af43f99 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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)
diff --git a/cli.c b/cli.c
index a0e80bea6..afba60f22 100755
--- 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),
-			        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)",
-			        (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);