Changeset 5035 for pjproject

Timestamp:

Mar 27, 2015 6:17:27 AM (9 years ago)

Author:

nanang

Message:

Re #1828: Fixed misc compile warnings (on iOS).

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-audiodev/wmme_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia-codec/speex_codec.c (modified) (1 diff)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)
• pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)
• pjsip-apps/src/pjsystest/main_console.c (modified) (1 diff)
• pjsip-apps/src/samples/pcaputil.c (modified) (1 diff)
• pjsip-apps/src/samples/pjsip-perf.c (modified) (2 diffs)
• pjsip-apps/src/samples/siprtp.c (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (1 diff)
• pjsip/src/pjsua2/media.cpp (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/wmme_dev.c

@@ -895 +895 @@
     enum { MAX_BURST = 1000 };
 
+    /* Suppress compile warning for unused debugging vars */
+    PJ_UNUSED_ARG(rec_cnt);
+    PJ_UNUSED_ARG(play_cnt);
     rec_cnt = play_cnt = 0;
 

pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c

@@ -805 +805 @@
         } else {
             /* NB frame */
-            unsigned int advance = submode;
+            int advance = submode;
             speex_mode_query(&speex_nb_mode, SPEEX_SUBMODE_BITS_PER_FRAME, &advance);
             if (advance < 0) {

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -85 +85 @@
 PJ_DEF(const char*) pjmedia_sdp_neg_state_str(pjmedia_sdp_neg_state state)
 {
-    if (state >=0 && state < (pjmedia_sdp_neg_state)PJ_ARRAY_SIZE(state_str))
+    if ((int)state >=0 && state < (pjmedia_sdp_neg_state)PJ_ARRAY_SIZE(state_str))
         return state_str[state];
 

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

@@ -852 +852 @@
      * checked first.
      */
-    if (ice_st->comp[0]->default_cand >= 0 &&
-        ice_st->comp[0]->cand_list[ice_st->comp[0]->default_cand].type
+    if (ice_st->comp[0]->cand_list[ice_st->comp[0]->default_cand].type
             == PJ_ICE_CAND_TYPE_SRFLX)
     {
@@ -1041 +1040 @@
     } else {
         pj_ice_strans_comp *comp = ice_st->comp[comp_id - 1];
-        pj_assert(comp->default_cand>=0 && comp->default_cand<comp->cand_cnt);
+        pj_assert(comp->default_cand<comp->cand_cnt);
         pj_memcpy(cand, &comp->cand_list[comp->default_cand],
                   sizeof(pj_ice_sess_cand));

pjproject/trunk/pjsip-apps/src/pjsystest/main_console.c

@@ -100 +100 @@
         while (*p && *p!='\r' && *p!='\n') {
             unsigned d = (*p - '0');
-            if (d < 0 || d >= choice->submenu_cnt) {
+            if (d >= choice->submenu_cnt) {
                 puts("Invalid selection");
                 choice = NULL;

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

@@ -308 +308 @@
     /* Get codec info and param for the specified payload type */
     app.pt = pkt0.rtp->pt;
-    if (app.pt >=0 && app.pt < 96) {
+    if (app.pt < 96) {
         T( pjmedia_codec_mgr_get_codec_info(cmgr, pkt0.rtp->pt, &ci) );
     } else {

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

@@ -1216 +1216 @@
         case 'c':
             app.client.job_count = my_atoi(pj_optarg);
-            if (app.client.job_count < 0) {
-                PJ_LOG(3,(THIS_FILE, "Invalid --local-port %s", pj_optarg));
-                return -1;
-            }
             if (app.client.job_count > pjsip_cfg()->tsx.max_count)
                 PJ_LOG(3,(THIS_FILE, 
@@ -1260 +1256 @@
         case 't':
             app.client.timeout = my_atoi(pj_optarg);
-            if (app.client.timeout < 0 || app.client.timeout > 600) {
+            if (app.client.timeout > 600) {
                 PJ_LOG(3,(THIS_FILE, "Invalid --timeout %s", pj_optarg));
                 return -1;

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

@@ -915 +915 @@
         case 'c':
             app.max_calls = atoi(pj_optarg);
-            if (app.max_calls < 0 || app.max_calls > MAX_CALLS) {
-                PJ_LOG(3,(THIS_FILE, "Invalid max calls value %s", pj_optarg));
+            if (app.max_calls > MAX_CALLS) {
+                PJ_LOG(3,(THIS_FILE,"Invalid max calls value %s "
+                                    "(must be <= %d)", pj_optarg, MAX_CALLS));
                 return 1;
             }

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -3637 +3637 @@
     if (pjsip_cfg()->endpt.disable_secure_dlg_check == PJ_FALSE &&
         dlg->secure && e->body.tsx_state.type==PJSIP_EVENT_RX_MSG &&
-        (tsx->role==PJSIP_ROLE_UAC && tsx->status_code/100 == 2 ||
-         tsx->role==PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING) &&
+        ((tsx->role==PJSIP_ROLE_UAC && tsx->status_code/100 == 2) ||
+         (tsx->role==PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING))
+        &&
         (tsx->method.id==PJSIP_INVITE_METHOD || 
          pjsip_method_cmp(&tsx->method, &pjsip_update_method)==0))

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -154 +154 @@
          */
         if (bytes_read > MIN_SIZE) {
-            pj_size_t size_eaten;
+            pj_ssize_t size_eaten;
             const pj_sockaddr *src_addr = &rdata->pkt_info.src_addr;
 

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -1011 +1011 @@
 : winId(win_id)
 {
+#if !PJSUA_HAS_VIDEO
+    /* Suppress warning of unused field when video is disabled */
+    PJ_UNUSED_ARG(winId);
+#endif
 }