Misc (re #3087): Suppressed build warning on Mac

pjlib-util/src/pjlib-util/scanner.c

@@ -304,7 +304,7 @@ PJ_DEF(void) pj_scan_get_unescape( pj_scanner *scanner,
     /* Must not match character '%' */
     pj_assert(pj_cis_match(spec,'%')==0);
 
-    if (pj_scan_is_eof(scanner) || !pj_cis_match(spec, *s) && *s != '%') {
+    if (pj_scan_is_eof(scanner) || (!pj_cis_match(spec, *s) && *s != '%')) {
 	pj_scan_syntax_err(scanner);
 	return;
     }

pjlib/src/pj/ip_helper_generic.c

@@ -472,9 +472,9 @@ PJ_DEF(pj_status_t) pj_enum_ip_route(unsigned *p_cnt,
     return PJ_SUCCESS;
 }
 
+#if defined(PJ_LINUX) && PJ_LINUX!=0
 static pj_status_t get_ipv6_deprecated(unsigned *count, pj_sockaddr addr[])
 {
-#if defined(PJ_LINUX) && PJ_LINUX!=0
     struct {
         struct nlmsghdr        nlmsg_info;
         struct ifaddrmsg    ifaddrmsg_info;
@@ -564,12 +564,8 @@ static pj_status_t get_ipv6_deprecated(unsigned *count, pj_sockaddr addr[])
     *count = idx;
 
     return PJ_SUCCESS;
-#else
-    *count = 0;
-    return PJ_ENOTSUP;
-#endif
 }
-
+#endif
 
 /*
  * Enumerate the local IP interface currently active in the host.

pjlib/src/pjlib-test/ioq_stress_test.c

@@ -479,7 +479,7 @@ static int worker_thread(void *p)
 	}
     }
 
-    //TRACE((THIS_FILE, "thread exiting, n_events=%d", n_events));
+    TRACE((THIS_FILE, "thread exiting, n_events=%d", n_events));
     return 0;
 }
 

pjlib/src/pjlib-test/timer.c

@@ -89,7 +89,7 @@ static int test_timer_heap(void)
     count = MIN_COUNT;
     for (i=0; i<LOOP; ++i) {
 	int early = 0;
-	int done=0;
+	//int done=0;
 	int cancelled=0;
 	int rc;
 	pj_timestamp t1, t2, t_sched, t_cancel, t_poll;
@@ -155,7 +155,7 @@ static int test_timer_heap(void)
 #endif
 	    pj_get_timestamp(&t2);
 	    if (rc > 0) {
-		done += rc;
+		//done += rc;
 		t_poll.u32.lo += (t2.u32.lo - t1.u32.lo);
 	    }
 

pjmedia/src/pjmedia-audiodev/coreaudio_dev.m

@@ -1475,6 +1475,7 @@ static pj_status_t create_audio_unit(AudioComponent io_comp,
     if (dir & PJMEDIA_DIR_PLAYBACK) {
 	AURenderCallbackStruct output_cb;
 	AudioStreamBasicDescription streamFormat = strm->streamFormat;
+#if !COREAUDIO_MAC
 	BOOL isMacCatalystApp = false;
 
 #ifdef __IPHONE_13_0
@@ -1486,6 +1487,7 @@ static pj_status_t create_audio_unit(AudioComponent io_comp,
              */
             isMacCatalystApp = [NSProcessInfo processInfo].isMacCatalystApp;
 	}
+#endif
 #endif
 
 	/* Set the stream format */
@@ -2235,8 +2237,8 @@ static pj_status_t ca_stream_stop(pjmedia_aud_stream *strm)
     }
     pj_mutex_unlock(stream->cf->mutex);
 
-#if !COREAUDIO_MAC && SETUP_AV_AUDIO_SESSION
     if (should_deactivate) {
+#if !COREAUDIO_MAC && SETUP_AV_AUDIO_SESSION
         if ([stream->sess 
              respondsToSelector:@selector(setActive:withOptions:error:)])
         {
@@ -2249,8 +2251,8 @@ static pj_status_t ca_stream_stop(pjmedia_aud_stream *strm)
             			      "audio session"));
             }
         }
-    }
 #endif
+    }
 
     stream->quit_flag = 1;
     stream->play_thread_initialized = 0;

pjmedia/src/pjmedia-codec/vid_toolbox.m

@@ -674,10 +674,8 @@ static pj_status_t vtool_codec_open(pjmedia_vid_codec *codec,
     	for (i = h264_fmtp.sprop_param_sets_len-code_size; i >= code_size;
     	     i--)
     	{
-    	    pj_bool_t found = PJ_TRUE;
     	    for (j = 0; j < code_size; j++) {
     	        if (h264_fmtp.sprop_param_sets[i+j] != start_code[j]) {
-    	            found = PJ_FALSE;
     	            break;
     	        }
     	    }

pjmedia/src/test/mips_test.c

@@ -1075,7 +1075,7 @@ static pjmedia_port* create_wsola_plc(unsigned loss_pct,
 	opt |= PJMEDIA_WSOLA_NO_PLC;
 
     status = pjmedia_wsola_create(pool, clock_rate, samples_per_frame,
-				  channel_count, 0, &wp->wsola);
+				  channel_count, opt, &wp->wsola);
     if (status != PJ_SUCCESS)
 	return NULL;
 
@@ -1249,7 +1249,7 @@ static pjmedia_port* create_wsola_discard(unsigned discard_pct,
 	opt |= PJMEDIA_WSOLA_NO_DISCARD;
 
     status = pjmedia_wsola_create(pool, clock_rate, samples_per_frame,
-				  channel_count, 0, &wp->wsola);
+				  channel_count, opt, &wp->wsola);
     if (status != PJ_SUCCESS)
 	return NULL;
 

pjnath/src/pjnath-test/concur_test.c

@@ -364,9 +364,7 @@ on_return:
 
 int concur_test(void)
 {
-    int rc = 0;
-
-    rc += stun_destroy_test();
+    stun_destroy_test();
 
     return 0;
 }