kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5804

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-11-21 01:21:39 +00:00
parent 3cb060d80f
commit 0c5e18d880
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -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_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_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794)

10
cli.c
View File

@@ -460,15 +460,15 @@ static int handle_chanlist(int fd, int argc, char *argv[])
} }
if (concise) { if (concise) {
ast_cli(fd, CONCISE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), 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->appl ? c->appl : "(None)", c->data ? c->data : "",
(c->cid.cid_num && !ast_strlen_zero(c->cid.cid_num)) ? c->cid.cid_num : "", c->cid.cid_num ? c->cid.cid_num : "",
(c->accountcode && !ast_strlen_zero(c->accountcode)) ? c->accountcode : "", c->amaflags, c->accountcode ? c->accountcode : "", c->amaflags,
durbuf, bc ? bc->name : "(None)"); durbuf, bc ? bc->name : "(None)");
} else if (verbose) { } else if (verbose) {
ast_cli(fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), 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->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->cid.cid_num ? c->cid.cid_num : "", durbuf,
(c->accountcode && !ast_strlen_zero(c->accountcode)) ? c->accountcode : "", bc ? bc->name : "(None)"); c->accountcode ? c->accountcode : "", bc ? bc->name : "(None)");
} else { } else {
if (!ast_strlen_zero(c->context) && !ast_strlen_zero(c->exten)) if (!ast_strlen_zero(c->context) && !ast_strlen_zero(c->exten))
snprintf(locbuf, sizeof(locbuf), "%s@%s:%d", c->exten, c->context, c->priority); snprintf(locbuf, sizeof(locbuf), "%s@%s:%d", c->exten, c->context, c->priority);