[asterisk-commits] trunk r21849 - /trunk/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Fri Apr 21 06:05:54 2006
New Revision: 21849

URL: http://svn.digium.com/view/asterisk?rev=21849&view=rev
Log:
more NULL "" equivalence in cid fields.


Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=21849&r1=21848&r2=21849&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Apr 21 06:05:54 2006
@@ -666,8 +666,8 @@
 
 			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>",
-				user->chan->cid.cid_name ? user->chan->cid.cid_name : "<no name>",
+				S_OR(user->chan->cid.cid_num, "<unknown>"),
+				S_OR(user->chan->cid.cid_name, "<no name>"),
 				user->chan->name,
 				user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
 				user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
@@ -1675,12 +1675,11 @@
 		        "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 :
-		         "<unknown>",
-		         user->chan->cid.cid_name ? user->chan->cid.cid_name :
-		          "<no name>", hr, min, sec);
+			chan->name, chan->uniqueid, conf->confno, 
+			user->user_no,
+			S_OR(user->chan->cid.cid_num, "<unknown>"),
+		        S_OR(user->chan->cid.cid_name, "<no name>"),
+			hr, min, sec);
 
 		conf->users--;
 		conf->refcount--;