More cleaning up on compile warning.

git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/vs-reorg2@2657 74dad513-b988-da41-8d7b-12977e46ad98

pjsip/src/test/main.c

@@ -39,6 +39,8 @@ int main(int argc, char *argv[])
     int retval;
     char **opt_arg;
 
+    PJ_UNUSED_ARG(argc);
+
     /* Parse arguments. */
     opt_arg = argv+1;
     while (*opt_arg) {

third_party/g7221/common/basic_op.c

@@ -1714,7 +1714,7 @@ Word32 L_msu0 (Word32 L_var3, Word16 var1, Word16 var2)
 UWord32 LU_shl (UWord32 L_var1, Word16 var2)
 {
     Word16 neg_var2;
-    UWord32 L_var_out;
+    UWord32 L_var_out = 0;
 
     if (var2 <= 0)
     {

third_party/ilbc/iCBSearch.c

@@ -234,22 +234,20 @@
 
            /* unrestricted search */
 
-           if (CB_RESRANGE == -1) {
+#	   if CB_RESRANGE == -1
+           //if (CB_RESRANGE == -1) {
                sInd=0;
                eInd=range-1;
                sIndAug=20;
                eIndAug=39;
-           }
-
-
-
-
+           //}
 
+#	   else
 
            /* restricted search around best index from first
            codebook section */
 
-           else {
+           //else {
                /* Initialize search indices */
                sIndAug=0;
                eIndAug=0;
@@ -307,7 +305,10 @@
                        eInd = range;
                    }
                }
-           }
+
+           //}
+#	   endif /* CB_RESRANGE == -1 */
+
 
            /* search of higher codebook section */
 

third_party/srtp/crypto/math/datatypes.c

@@ -149,10 +149,9 @@ hex_char_to_nibble(uint8_t c) {
   case ('E'): return 0xe;
   case ('f'): return 0xf;
   case ('F'): return 0xf;
-  default: return -1;   /* this flags an error */
+  default: break;   /* this flags an error */
   }
-  /* NOTREACHED */
-  return -1;  /* this keeps compilers from complaining */
+  return -1;
 }
 
 int

third_party/srtp/include/srtp_priv.h

@@ -100,10 +100,6 @@ typedef struct {
 
 #endif
 
-#ifdef _MSC_VER
-#   pragma warning( pop ) 
-#endif
-
 
 typedef struct {
   uint16_t profile_specific;    /* profile-specific info               */
@@ -166,6 +162,11 @@ typedef struct {
 #endif
 
 
+#ifdef _MSC_VER
+#   pragma warning( pop ) 
+#endif
+
+
 /*
  * the following declarations are libSRTP internal functions 
  */