Re #1326:

 - Fixed compile warnings on vs2005
 - Fixed compile error when PJMEDIA_HAS_VIDEO set to 0 on vs2005




git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3666 74dad513-b988-da41-8d7b-12977e46ad98

12 files changed, 41 insertions, 18 deletions

diff --git a/pjlib-util/src/pjlib-util/stun_simple_client.c b/pjlib-util/src/pjlib-util/stun_simple_client.c
index af597fc5..e4f0b0fe 100644
--- a/pjlib-util/src/pjlib-util/stun_simple_client.c
+++ b/pjlib-util/src/pjlib-util/stun_simple_client.c
@@ -44,7 +44,7 @@ PJ_DEF(pj_status_t) pjstun_get_mapped_addr( pj_pool_factory *pf,
 {
     unsigned srv_cnt;
     pj_sockaddr_in srv_addr[2];
-    int i, j, send_cnt = 0;
+    int i, send_cnt = 0;
     pj_pool_t *pool;
     struct query_rec {
 	struct {
@@ -123,6 +123,7 @@ PJ_DEF(pj_status_t) pjstun_get_mapped_addr( pj_pool_factory *pf,
 
 	/* Send messages to servers that has not given us response. */
 	for (i=0; i<sock_cnt && status==PJ_SUCCESS; ++i) {
+	    unsigned j;
 	    for (j=0; j<srv_cnt && status==PJ_SUCCESS; ++j) {
 		pjstun_msg_hdr *msg_hdr = (pjstun_msg_hdr*) out_msg;
                 pj_ssize_t sent_len;
diff --git a/pjlib/src/pj/ioqueue_common_abs.c b/pjlib/src/pj/ioqueue_common_abs.c
index 8d68275b..296aea90 100644
--- a/pjlib/src/pj/ioqueue_common_abs.c
+++ b/pjlib/src/pj/ioqueue_common_abs.c
@@ -283,7 +283,7 @@ void ioqueue_dispatch_write_event(pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h)
 	/* Socket is writable. */
         struct write_operation *write_op;
         pj_ssize_t sent;
-        pj_status_t send_rc;
+        pj_status_t send_rc = PJ_SUCCESS;
 
         /* Get the first in the queue. */
         write_op = h->write_list.next;
@@ -312,8 +312,8 @@ void ioqueue_dispatch_write_event(pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h)
 	     */
 	    //write_op->op = 0;
         } else if (write_op->op == PJ_IOQUEUE_OP_SEND_TO) {
-	    int retry;
-	    for (retry=0; retry<2; ++retry) {
+	    int retry = 2;
+	    while (--retry >= 0) {
 		send_rc = pj_sock_sendto(h->fd, 
 					 write_op->buf+write_op->written,
 					 &sent, write_op->flags,
@@ -935,17 +935,19 @@ PJ_DEF(pj_status_t) pj_ioqueue_sendto( pj_ioqueue_key_t *key,
 {
     struct write_operation *write_op;
     unsigned retry;
-#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
-	    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
     pj_bool_t restart_retry = PJ_FALSE;
-#endif
     pj_status_t status;
     pj_ssize_t sent;
 
     PJ_ASSERT_RETURN(key && op_key && data && length, PJ_EINVAL);
     PJ_CHECK_STACK();
 
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+	    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
 retry_on_restart:
+#else
+    PJ_UNUSED_ARG(restart_retry);
+#endif
     /* Check if key is closing. */
     if (IS_CLOSING(key))
 	return PJ_ECANCELLED;
diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c
index 2b703e74..866afb99 100644
--- a/pjlib/src/pj/os_core_win32.c
+++ b/pjlib/src/pj/os_core_win32.c
@@ -1428,5 +1428,6 @@ PJ_DEF(pj_color_t) pj_term_get_color(void)
 PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[],
                        unsigned flags)
 {
+    PJ_UNUSED_ARG(flags);
     return (*main_func)(argc, argv);
 }
diff --git a/pjmedia/include/pjmedia-codec/audio_codecs.h b/pjmedia/include/pjmedia-codec/audio_codecs.h
index 2a651e95..e74bd3c9 100644
--- a/pjmedia/include/pjmedia-codec/audio_codecs.h
+++ b/pjmedia/include/pjmedia-codec/audio_codecs.h
@@ -48,8 +48,8 @@ typedef struct pjmedia_audio_codec_config
     /** Speex codec settings. See #pjmedia_codec_speex_init() for more info */
     struct {
 	unsigned	option;		/**< Bitmask of options.	*/
-	unsigned	quality;	/**< Codec quality.		*/
-	unsigned	complexity;	/**< Codec complexity.		*/
+	int		quality;	/**< Codec quality.		*/
+	int		complexity;	/**< Codec complexity.		*/
     } speex;
 
     /** iLBC settings */
diff --git a/pjmedia/src/pjmedia/event.c b/pjmedia/src/pjmedia/event.c
index fee0917e..30df9541 100644
--- a/pjmedia/src/pjmedia/event.c
+++ b/pjmedia/src/pjmedia/event.c
@@ -107,6 +107,9 @@ PJ_DEF(pj_status_t) pjmedia_event_publish( pjmedia_event_publisher *epub,
     TRACE_((THIS_FILE, "Event %s is published by publisher %s",
 		       pjmedia_fourcc_name(event->type, event_name),
 		       pjmedia_fourcc_name(epub->sig, epub_name)));
+    /* Suppress compiler warning if trace is disabled */
+    PJ_UNUSED_ARG(event_name);
+    PJ_UNUSED_ARG(epub_name);
 
     esub = epub->subscription_list.next;
     if (!esub)
diff --git a/pjmedia/src/test/vid_dev_test.c b/pjmedia/src/test/vid_dev_test.c
index 36966047..0b4572a5 100644
--- a/pjmedia/src/test/vid_dev_test.c
+++ b/pjmedia/src/test/vid_dev_test.c
@@ -75,6 +75,8 @@ static int enum_devs(void)
 static pj_status_t vid_event_cb(pjmedia_event_subscription *esub,
 				pjmedia_event *event)
 {
+    PJ_UNUSED_ARG(esub);
+
     if (event->type == PJMEDIA_EVENT_WND_CLOSED)
         is_quitting = PJ_TRUE;
 
diff --git a/pjmedia/src/test/vid_port_test.c b/pjmedia/src/test/vid_port_test.c
index cd7acd8d..5d04e24b 100644
--- a/pjmedia/src/test/vid_port_test.c
+++ b/pjmedia/src/test/vid_port_test.c
@@ -31,6 +31,8 @@ static pj_bool_t is_quitting = PJ_FALSE;
 static pj_status_t vid_event_cb(pjmedia_event_subscription *esub,
 				pjmedia_event *event)
 {
+    PJ_UNUSED_ARG(esub);
+
     if (event->type == PJMEDIA_EVENT_WND_CLOSED)
         is_quitting = PJ_TRUE;
 
@@ -46,7 +48,6 @@ static int capture_render_loopback(pj_bool_t active,
     pjmedia_vid_dev_info cdi, rdi;
     pjmedia_vid_port_param param;
     pjmedia_video_format_detail *vfd;
-    pjmedia_vid_dev_cb cb;
     pjmedia_event_subscription esub;
     pj_status_t status;
     int rc = 0, i;
@@ -180,7 +181,6 @@ static int vidport_test(void)
         PJMEDIA_FORMAT_RGBA,
         PJMEDIA_FORMAT_I420
     };
-    pj_status_t status;
 
     PJ_LOG(3, (THIS_FILE, " Video port tests:"));
 
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index e311c32a..6aa04749 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -2653,7 +2653,7 @@ static void on_call_tsx_state(pjsua_call_id call_id,
 
 /* General processing for media state. "mi" is the media index */
 static void on_call_generic_media_state(pjsua_call_info *ci, unsigned mi,
-                                         pj_bool_t *has_error)
+                                        pj_bool_t *has_error)
 {
     const char *status_name[] = {
         "None",
@@ -2663,6 +2663,8 @@ static void on_call_generic_media_state(pjsua_call_info *ci, unsigned mi,
         "Error"
     };
 
+    PJ_UNUSED_ARG(has_error);
+
     pj_assert(ci->media[mi].status <= PJ_ARRAY_SIZE(status_name));
     pj_assert(PJSUA_CALL_MEDIA_ERROR == 4);
 
@@ -2675,6 +2677,8 @@ static void on_call_generic_media_state(pjsua_call_info *ci, unsigned mi,
 static void on_call_audio_state(pjsua_call_info *ci, unsigned mi,
                                 pj_bool_t *has_error)
 {
+    PJ_UNUSED_ARG(has_error);
+
     /* Stop ringback */
     ring_stop(ci->id);
 
@@ -2761,6 +2765,9 @@ static void on_call_audio_state(pjsua_call_info *ci, unsigned mi,
 static void on_call_video_state(pjsua_call_info *ci, unsigned mi,
                                 pj_bool_t *has_error)
 {
+    PJ_UNUSED_ARG(ci);
+    PJ_UNUSED_ARG(mi);
+    PJ_UNUSED_ARG(has_error);
 }
 
 /*
@@ -3149,6 +3156,8 @@ static void on_call_media_event(pjsua_call_id call_id,
                                 pjmedia_event *event)
 {
     char event_name[5];
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(med_idx);
     PJ_LOG(4,(THIS_FILE, "Event %s",
 	      pjmedia_fourcc_name(event->type, event_name)));
 }
diff --git a/pjsip-apps/src/samples/simpleua.c b/pjsip-apps/src/samples/simpleua.c
index 2ec49d37..056de017 100644
--- a/pjsip-apps/src/samples/simpleua.c
+++ b/pjsip-apps/src/samples/simpleua.c
@@ -224,7 +224,7 @@ static pjsip_module msg_logger =
  */
 int main(int argc, char *argv[])
 {
-    pj_pool_t *pool;
+    pj_pool_t *pool = NULL;
     pj_status_t status;
     unsigned i;
 
@@ -593,7 +593,8 @@ int main(int argc, char *argv[])
 	pjsip_endpt_destroy(g_endpt);
 
     /* Release pool */
-    pj_pool_release(pool);
+    if (pool)
+	pj_pool_release(pool);
 
     return 0;
 }
diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h
index e712d9d3..ab3d2149 100644
--- a/pjsip/include/pjsua-lib/pjsua_internal.h
+++ b/pjsip/include/pjsua-lib/pjsua_internal.h
@@ -686,6 +686,8 @@ PJ_INLINE(void) pjsua_vid_win_reset(pjsua_vid_win_id wid)
     w->ref_cnt = 0;
     w->pool = pool;
     w->preview_cap_id = PJMEDIA_VID_INVALID_DEV;
+#else
+    PJ_UNUSED_ARG(wid);
 #endif
 }
 
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
index 1c835e15..f8abc938 100644
--- a/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -1324,8 +1324,7 @@ PJ_DEF(pj_status_t) pjsua_call_get_info( pjsua_call_id call_id,
 						call_med->strm.v.rdr_win_id;
 
 	    if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {
-		pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.cap_win_id];
-		cap_dev = w->preview_cap_id;
+		cap_dev = call_med->strm.v.cap_dev;
 	    }
 	    info->media[info->media_cnt].stream.vid.cap_dev = cap_dev;
 	} else {
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index d19bb744..7c2929fc 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -315,8 +315,6 @@ static pj_bool_t options_on_rx_request(pjsip_rx_data *rdata)
 {
     pjsip_tx_data *tdata;
     pjsip_response_addr res_addr;
-    pjmedia_transport_info tpinfo;
-    pjmedia_sdp_session *sdp;
     const pjsip_hdr *cap_hdr;
     pj_status_t status;
 
@@ -385,6 +383,9 @@ static pj_bool_t options_on_rx_request(pjsip_rx_data *rdata)
     /* Get media socket info, make sure transport is ready */
 #if DISABLED_FOR_TICKET_1185
     if (pjsua_var.calls[0].med_tp) {
+	pjmedia_transport_info tpinfo;
+	pjmedia_sdp_session *sdp;
+
 	pjmedia_transport_info_init(&tpinfo);
 	pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo);
 
@@ -2620,6 +2621,8 @@ PJ_DEF(void) pjsua_dump(pj_bool_t detail)
     pjmedia_endpt_dump(pjsua_get_pjmedia_endpt());
 
     PJ_LOG(3,(THIS_FILE, "Dumping media transports:"));
+    // Suppress compile warning caused by unreferenced var.
+    PJ_UNUSED_ARG(i);
 #if DISABLED_FOR_TICKET_1185
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
 	pjsua_call *call = &pjsua_var.calls[i];