Changeset 4487 for pjproject

Timestamp:

Apr 23, 2013 5:37:41 AM (12 years ago)

Author:

bennylp

Message:

Re #1630: fixed various warnings

Location:

pjproject/trunk

Files:

• pjlib/src/pjlib-test/activesock.c (modified) (2 diffs)
• pjmedia/src/pjmedia-codec/opencore_amr.c (modified) (4 diffs)
• pjmedia/src/pjmedia/sound_port.c (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pjlib-test/activesock.c

@@ -102 +102 @@
     pj_sock_t sock_fd = PJ_INVALID_SOCKET;
     pj_sockaddr addr;
-    int addr_len;
     pj_activesock_cb activesock_cb;
     pj_status_t status;
@@ -110 +109 @@
 
     pj_sockaddr_in_init(&addr.ipv4, NULL, 0);
-    addr_len = sizeof(addr);
 
     pj_bzero(&activesock_cb, sizeof(activesock_cb));

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

@@ -809 +809 @@
     unsigned dtx_cnt, sid_cnt;
     pj_status_t status;
-    int size;
 
     pj_assert(amr_data != NULL);
@@ -827 +826 @@
     bitstream = (unsigned char*)output->buf;
     while (nsamples >= samples_per_frame) {
+        int size;
         if (amr_data->enc_setting.amr_nb) {
 #ifdef USE_AMRNB
@@ -832 +832 @@
                                              amr_data->enc_mode,
                                              speech, bitstream, 0);
+#else
+            size = 0;
 #endif
         } else {
@@ -837 +839 @@
             size = E_IF_encode (amr_data->encoder, amr_data->enc_mode,
                                 speech, bitstream, 0);
+#else
+            size = 0;
 #endif
         }

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -235 +235 @@
         /* EC is wanted */
         if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 &&
-            snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)
+            (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC))
         {
             /* Device supports EC */
@@ -528 +528 @@
     /* Determine whether we use device or software EC */
     if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 &&
-        snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)
+        (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC))
     {
         /* We use device EC */

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

@@ -3888 +3888 @@
         default:
             pj_assert(!"Unexpected INVITE tsx state");
+            break;
         }
 
@@ -4036 +4037 @@
         default:
             pj_assert(!"Unexpected state");
+            break;
         }