diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-21 01:21:39 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-21 01:21:39 +0000 |
commit | 7c4990dbf5c179c2d9168c61773b5521a8fe2952 (patch) | |
tree | 1b546e29b83627388b906dbba29aeae745fe25a6 /cli.c | |
parent | dda02a7ba6137a040a08979c49d27282ee43c63b (diff) |
issue #5804
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7159 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cli.c')
-rwxr-xr-x | cli.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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); |