kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 18:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

more NULL "" equivalence in cid fields.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-21 11:05:54 +00:00
parent 7ecc442d77
commit b5e6162359
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_meetme.c
View File

@@ -666,8 +666,8 @@ static int conf_cmd(int fd, int argc, char **argv) {
ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %02d:%02d:%02d\n", ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %02d:%02d:%02d\n",
user->user_no, user->user_no,
user->chan->cid.cid_num ? user->chan->cid.cid_num : "<unknown>", S_OR(user->chan->cid.cid_num, "<unknown>"),
user->chan->cid.cid_name ? user->chan->cid.cid_name : "<no name>", S_OR(user->chan->cid.cid_name, "<no name>"),
user->chan->name, user->chan->name,
user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "", user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "", user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
@@ -1677,10 +1677,9 @@ bailoutandtrynormal:
"Duration: %02d:%02d:%02d\r\n", "Duration: %02d:%02d:%02d\r\n",
chan->name, chan->uniqueid, conf->confno, chan->name, chan->uniqueid, conf->confno,
user->user_no, user->user_no,
user->chan->cid.cid_num ? user->chan->cid.cid_num : S_OR(user->chan->cid.cid_num, "<unknown>"),
"<unknown>", S_OR(user->chan->cid.cid_name, "<no name>"),
user->chan->cid.cid_name ? user->chan->cid.cid_name : hr, min, sec);
"<no name>", hr, min, sec);
conf->users--; conf->users--;
conf->refcount--; conf->refcount--;