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

@@ -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 : "<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->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
 				user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
@@ -1677,10 +1677,9 @@ bailoutandtrynormal:
 		        "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 :
+			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->refcount--;