use S_OR where appropriate, comment an unclear difference in format
between CONCISE and VERBOSE git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
8d12c56f16
commit
fd45a19ab4
18
cli.c
18
cli.c
|
@ -422,15 +422,21 @@ 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 ? c->data : "",
|
c->appl ? c->appl : "(None)",
|
||||||
|
S_OR(c->data, ""), /* XXX different from verbose ? */
|
||||||
S_OR(c->cid.cid_num, ""),
|
S_OR(c->cid.cid_num, ""),
|
||||||
c->accountcode ? c->accountcode : "", c->amaflags,
|
S_OR(c->accountcode, ""),
|
||||||
durbuf, bc ? bc->name : "(None)");
|
c->amaflags,
|
||||||
|
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 ? S_OR(c->data, "(Empty)" ): "(None)",
|
c->appl ? c->appl : "(None)",
|
||||||
S_OR(c->cid.cid_num, ""), durbuf,
|
c->data ? S_OR(c->data, "(Empty)" ): "(None)",
|
||||||
c->accountcode ? c->accountcode : "", bc ? bc->name : "(None)");
|
S_OR(c->cid.cid_num, ""),
|
||||||
|
durbuf,
|
||||||
|
S_OR(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);
|
||||||
|
|
Loading…
Reference in New Issue