Changeset 4624 for pjproject/trunk/pjsip-apps/src/samples/icedemo.c

Timestamp:

Oct 21, 2013 6:37:30 AM (11 years ago)

Author:

ming

Message:

Re #1630 (misc):
Fixed compiler warnings. Thanks to Mark Michelson for the patch.

File:

• pjproject/trunk/pjsip-apps/src/samples/icedemo.c (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/samples/icedemo.c

@@ -515 +515 @@
 }
 
-#define PRINT(fmt, arg0, arg1, arg2, arg3, arg4, arg5)      \
+#define PRINT(...)          \
         printed = pj_ansi_snprintf(p, maxlen - (p-buffer),  \
-                                   fmt, arg0, arg1, arg2, arg3, arg4, arg5); \
+                                   __VA_ARGS__); \
         if (printed <= 0 || printed >= (int)(maxlen - (p-buffer))) \
             return -PJ_ETOOSMALL; \
@@ -541 +541 @@
 
     PRINT("%s\n",
-          pj_ice_get_cand_type_name(cand->type),
-          0, 0, 0, 0, 0);
+          pj_ice_get_cand_type_name(cand->type));
 
     if (p == buffer+maxlen)
@@ -564 +563 @@
 
     /* Write "dummy" SDP v=, o=, s=, and t= lines */
-    PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n", 
-          0, 0, 0, 0, 0, 0);
+    PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n");
 
     /* Get ufrag and pwd from current session */
@@ -576 +574 @@
            local_ufrag.ptr,
            (int)local_pwd.slen,
-           local_pwd.ptr, 
-           0, 0);
+           local_pwd.ptr);
 
     /* Write each component */
@@ -597 +594 @@
                   (int)pj_sockaddr_get_port(&cand[0].addr),
                   pj_sockaddr_print(&cand[0].addr, ipaddr,
-                                    sizeof(ipaddr), 0),
-                  0, 0, 0, 0);
+                                    sizeof(ipaddr), 0));
         } else if (comp==1) {
             /* For component 2, default address is in a=rtcp line */
@@ -604 +600 @@
                   (int)pj_sockaddr_get_port(&cand[0].addr),
                   pj_sockaddr_print(&cand[0].addr, ipaddr,
-                                    sizeof(ipaddr), 0),
-                  0, 0, 0, 0);
+                                    sizeof(ipaddr), 0));
         } else {
             /* For other components, we'll just invent this.. */
@@ -611 +606 @@
                   (int)pj_sockaddr_get_port(&cand[0].addr),
                   pj_sockaddr_print(&cand[0].addr, ipaddr,
-                                    sizeof(ipaddr), 0),
-                  0, 0, 0, 0);
+                                    sizeof(ipaddr), 0));
         }