From b5e616235950e75a34655e2abb6e2a5131982266 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Fri, 21 Apr 2006 11:05:54 +0000 Subject: [PATCH] more NULL "" equivalence in cid fields. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21849 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 6ca35a241b..fed92f3725 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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", user->user_no, - user->chan->cid.cid_num ? user->chan->cid.cid_num : "", - user->chan->cid.cid_name ? user->chan->cid.cid_name : "", + S_OR(user->chan->cid.cid_num, ""), + S_OR(user->chan->cid.cid_name, ""), user->chan->name, user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "", user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "", @@ -1675,12 +1675,11 @@ bailoutandtrynormal: "CIDnum: %s\r\n" "CIDname: %s\r\n" "Duration: %02d:%02d:%02d\r\n", - chan->name, chan->uniqueid, conf->confno, - user->user_no, - user->chan->cid.cid_num ? user->chan->cid.cid_num : - "", - user->chan->cid.cid_name ? user->chan->cid.cid_name : - "", hr, min, sec); + chan->name, chan->uniqueid, conf->confno, + user->user_no, + S_OR(user->chan->cid.cid_num, ""), + S_OR(user->chan->cid.cid_name, ""), + hr, min, sec); conf->users--; conf->refcount--;