Changeset 4412

Timestamp:

Mar 5, 2013 3:12:32 AM (12 years ago)

Author:

riza

Message:

Misc (re #1559): fixed compile errors/warnings on MSVC

Location:

pjproject/trunk

Files:

• pjlib/src/pj/lock.c (modified) (1 diff)
• pjmedia/src/pjmedia/converter.c (modified) (1 diff)
• pjnath/src/pjnath-test/concur_test.c (modified) (3 diffs)
• pjnath/src/pjnath-test/ice_test.c (modified) (3 diffs)
• pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/lock.c

@@ -710 +710 @@
     PJ_LOG(4,(THIS_FILE, "Group lock %p, ref_cnt=%d. Reference holders: %s",
                grp_lock, pj_grp_lock_get_ref(grp_lock), info.ptr));
+#else
+    PJ_UNUSED_ARG(grp_lock);
 #endif
 }

pjproject/trunk/pjmedia/src/pjmedia/converter.c

@@ -40 +40 @@
 {
     pjmedia_converter_mgr *mgr;
+#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
     pj_status_t status = PJ_SUCCESS;
+#endif
 
     mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr);

pjproject/trunk/pjnath/src/pjnath-test/concur_test.c

@@ -159 +159 @@
 {
     struct stun_test_session *test_sess = (struct stun_test_session*)pj_stun_sock_get_user_data(stun_sock);
+
+    PJ_UNUSED_ARG(op);
+    PJ_UNUSED_ARG(status);
+
     test_sess->param.client_got_response++;
     return PJ_TRUE;
@@ -193 +197 @@
         pj_str_t server_ip = pj_str("127.0.0.1");
         status = pj_stun_sock_start(stun_sock[i], &server_ip,
-                                    test_sess->server_port, NULL);
+                                    (pj_uint16_t)test_sess->server_port, NULL);
         if (status != PJ_SUCCESS) {
             PJ_PERROR(1,(THIS_FILE, status, "Error starting stun socket"));
@@ -324 +328 @@
     }
 
+    /* Avoid compiler warning */
+    goto on_return;
+
 
 on_return:

pjproject/trunk/pjnath/src/pjnath-test/ice_test.c

@@ -468 +468 @@
                                     } \
                                     PJ_TIME_VAL_SUB(t, t0); \
-                                    if (PJ_TIME_VAL_MSEC(t) >= (timeout)) break; \
+                                    if ((unsigned)PJ_TIME_VAL_MSEC(t) >= (timeout)) \
+                                        break; \
                                 } \
                             }
@@ -1016 +1017 @@
 int ice_conc_test(void)
 {
-    const int LOOP = 100;
+    const unsigned LOOP = 100;
     pj_pool_t *pool;
     pj_stun_config stun_cfg;
@@ -1035 +1036 @@
             break;
     }
+
+    /* Avoid compiler warning */
+    goto on_return;
     
 on_return:

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -32 +32 @@
 #include <pj/compat/socket.h>
 
-
-#if 0
+#define ENABLE_TRACE 0
+
+#if defined(ENABLE_TRACE) && (ENABLE_TRACE != 0)
 #  define TRACE_PKT(expr)           PJ_LOG(5,expr)
 #else
@@ -1321 +1322 @@
     pj_ice_strans_comp *comp;
     pj_status_t status;
+#if defined(ENABLE_TRACE) && (ENABLE_TRACE != 0)
+    char daddr[PJ_INET6_ADDRSTRLEN];
+#endif
 
     PJ_ASSERT_RETURN(comp_id && comp_id <= ice_st->comp_cnt, PJ_EINVAL);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -744 +744 @@
     /* Copy binding port setting to STUN setting */
     pj_sockaddr_init(ice_cfg.af, &ice_cfg.stun.cfg.bound_addr,
-                     &cfg->bound_addr, cfg->port);
-    ice_cfg.stun.cfg.port_range = cfg->port_range;
+                     &cfg->bound_addr, (pj_uint16_t)cfg->port);
+    ice_cfg.stun.cfg.port_range = (pj_uint16_t)cfg->port_range;
     if (cfg->port != 0 && ice_cfg.stun.cfg.port_range == 0)
-        ice_cfg.stun.cfg.port_range = pjsua_var.ua_cfg.max_calls * 10;
+        ice_cfg.stun.cfg.port_range = 
+                                 (pj_uint16_t)(pjsua_var.ua_cfg.max_calls * 10);
 
     /* Copy QoS setting to STUN setting */
@@ -777 +778 @@
         /* Copy binding port setting to TURN setting */
         pj_sockaddr_init(ice_cfg.af, &ice_cfg.turn.cfg.bound_addr,
-                         &cfg->bound_addr, cfg->port);
-        ice_cfg.turn.cfg.port_range = cfg->port_range;
+                         &cfg->bound_addr, (pj_uint16_t)cfg->port);
+        ice_cfg.turn.cfg.port_range = (pj_uint16_t)cfg->port_range;
         if (cfg->port != 0 && ice_cfg.turn.cfg.port_range == 0)
-            ice_cfg.turn.cfg.port_range = pjsua_var.ua_cfg.max_calls * 10;
+            ice_cfg.turn.cfg.port_range = 
+                                 (pj_uint16_t)(pjsua_var.ua_cfg.max_calls * 10);
     }