Fixed unreached code, deprecated fopen(), unused arguments, and other warnings with MSVC

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

12 files changed, 64 insertions, 38 deletions

diff --git a/pjlib-util/src/pjlib-util-test/resolver_test.c b/pjlib-util/src/pjlib-util-test/resolver_test.c
index 5482150f..d6be1411 100644
--- a/pjlib-util/src/pjlib-util-test/resolver_test.c
+++ b/pjlib-util/src/pjlib-util-test/resolver_test.c
@@ -702,13 +702,14 @@ static void dns_callback(void *user_data,
 {
     PJ_UNUSED_ARG(user_data);
 
-    pj_assert(status == PJ_SUCCESS);
-    pj_assert(resp);
-    pj_assert(resp->hdr.anscount == 1);
-    pj_assert(resp->ans[0].type == PJ_DNS_TYPE_A);
-    pj_assert(resp->ans[0].rdata.a.ip_addr.s_addr == IP_ADDR0);
-
     pj_sem_post(sem);
+
+    PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return);
+    PJ_ASSERT_ON_FAIL(resp, return);
+    PJ_ASSERT_ON_FAIL(resp->hdr.anscount == 1, return);
+    PJ_ASSERT_ON_FAIL(resp->ans[0].type == PJ_DNS_TYPE_A, return);
+    PJ_ASSERT_ON_FAIL(resp->ans[0].rdata.a.ip_addr.s_addr == IP_ADDR0, return);
+
 }
 
 
@@ -778,9 +779,10 @@ static void dns_callback_1b(void *user_data,
     PJ_UNUSED_ARG(user_data);
     PJ_UNUSED_ARG(resp);
 
-    pj_assert(status == PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN));
-
     pj_sem_post(sem);
+
+    PJ_ASSERT_ON_FAIL(status==PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN),
+		      return);
 }
 
 
@@ -1014,16 +1016,20 @@ static void srv_cb_1(void *user_data,
 {
     PJ_UNUSED_ARG(user_data);
 
-    pj_assert(status == PJ_SUCCESS);
-    pj_assert(rec->count == 1);
-    pj_assert(rec->entry[0].priority == 1);
-    pj_assert(rec->entry[0].weight == 2);
-    pj_assert(pj_strcmp2(&rec->entry[0].server.name, "sip.somedomain.com")==0);
-    pj_assert(pj_strcmp2(&rec->entry[0].server.alias, "sipalias.somedomain.com")==0);
-    pj_assert(rec->entry[0].server.addr[0].s_addr == IP_ADDR1);
-    pj_assert(rec->entry[0].port == PORT1);
-
     pj_sem_post(sem);
+
+    PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return);
+    PJ_ASSERT_ON_FAIL(rec->count == 1, return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 1, return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 2, return);
+    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, "sip.somedomain.com")==0,
+		      return);
+    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias.somedomain.com")==0,
+		      return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].s_addr == IP_ADDR1, return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT1, return);
+
+    
 }
 
 static void srv_cb_1b(void *user_data,
@@ -1032,10 +1038,11 @@ static void srv_cb_1b(void *user_data,
 {
     PJ_UNUSED_ARG(user_data);
 
-    pj_assert(status == PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN));
-    pj_assert(rec->count == 0);
-
     pj_sem_post(sem);
+
+    PJ_ASSERT_ON_FAIL(status==PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN),
+		      return);
+    PJ_ASSERT_ON_FAIL(rec->count == 0, return);
 }
 
 static int srv_resolver_test(void)
@@ -1175,16 +1182,18 @@ static void srv_cb_2(void *user_data,
 {
     PJ_UNUSED_ARG(user_data);
 
-    pj_assert(status == PJ_SUCCESS);
-    pj_assert(rec->count == 1);
-    pj_assert(rec->entry[0].priority == 0);
-    pj_assert(rec->entry[0].weight == 0);
-    pj_assert(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0);
-    pj_assert(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0);
-    pj_assert(rec->entry[0].server.addr[0].s_addr == IP_ADDR2);
-    pj_assert(rec->entry[0].port == PORT2);
-
     pj_sem_post(sem);
+
+    PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return);
+    PJ_ASSERT_ON_FAIL(rec->count == 1, return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 0, return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 0, return);
+    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0,
+		      return);
+    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0,
+		      return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].s_addr == IP_ADDR2, return);
+    PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT2, return);
 }
 
 static int srv_resolver_fallback_test(void)
@@ -1306,9 +1315,12 @@ static void srv_cb_3(void *user_data,
     unsigned i;
 
     PJ_UNUSED_ARG(user_data);
+    PJ_UNUSED_ARG(status);
+    PJ_UNUSED_ARG(rec);
 
     pj_assert(status == PJ_SUCCESS);
     pj_assert(rec->count == PJ_DNS_SRV_MAX_ADDR);
+
     for (i=0; i<PJ_DNS_SRV_MAX_ADDR; ++i) {
 	unsigned j;
 
diff --git a/pjlib/include/pj/compat/cc_armcc.h b/pjlib/include/pj/compat/cc_armcc.h
index 095d4ab6..1761c228 100644
--- a/pjlib/include/pj/compat/cc_armcc.h
+++ b/pjlib/include/pj/compat/cc_armcc.h
@@ -51,5 +51,7 @@ typedef unsigned long long pj_uint64_t;
 
 #define PJ_INT64_FMT		"L"
 
+#define PJ_UNREACHED(x)	    	
+
 #endif	/* __PJ_COMPAT_CC_ARMCC_H__ */
 
diff --git a/pjlib/include/pj/compat/cc_codew.h b/pjlib/include/pj/compat/cc_codew.h
index 7dcaae5d..3f8b46ee 100644
--- a/pjlib/include/pj/compat/cc_codew.h
+++ b/pjlib/include/pj/compat/cc_codew.h
@@ -49,6 +49,7 @@ typedef unsigned long long pj_uint64_t;
 #define PJ_UINT64(val)		val##LLU
 #define PJ_INT64_FMT		"L"
 
+#define PJ_UNREACHED(x)	    	
 
 #endif	/* __PJ_COMPAT_CC_CODEW_H__ */
 
diff --git a/pjlib/include/pj/compat/cc_gcc.h b/pjlib/include/pj/compat/cc_gcc.h
index 35aecf23..edf04793 100644
--- a/pjlib/include/pj/compat/cc_gcc.h
+++ b/pjlib/include/pj/compat/cc_gcc.h
@@ -69,6 +69,7 @@
 #   define PJ_HAS_BZERO		1
 #endif
 
+#define PJ_UNREACHED(x)	    	
 
 #endif	/* __PJ_COMPAT_CC_GCC_H__ */
 
diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h
index b5a0e08e..e6c139da 100644
--- a/pjlib/include/pj/compat/cc_msvc.h
+++ b/pjlib/include/pj/compat/cc_msvc.h
@@ -38,6 +38,13 @@
 #if PJ_CC_VER_1 >= 8 && !defined(_CRT_SECURE_NO_DEPRECATE)
 #   define _CRT_SECURE_NO_DEPRECATE
 #endif
+#if PJ_CC_VER_1 >= 8 && !defined(_CRT_SECURE_NO_WARNINGS)
+#   define _CRT_SECURE_NO_WARNINGS
+    /* The above doesn't seem to work, at least on VS2005, so lets use
+     * this construct as well.
+     */
+#   pragma warning(disable: 4996)
+#endif
 
 #pragma warning(disable: 4127) // conditional expression is constant
 #pragma warning(disable: 4611) // not wise to mix setjmp with C++
@@ -71,5 +78,7 @@ typedef unsigned __int64 pj_uint64_t;
 #define PJ_UINT64(val)		val##ui64
 #define PJ_INT64_FMT		"I64"
 
+#define PJ_UNREACHED(x)	    	
 
 #endif	/* __PJ_COMPAT_CC_MSVC_H__ */
+
diff --git a/pjlib/include/pj/compat/cc_mwcc.h b/pjlib/include/pj/compat/cc_mwcc.h
index 511fed76..6c768b98 100644
--- a/pjlib/include/pj/compat/cc_mwcc.h
+++ b/pjlib/include/pj/compat/cc_mwcc.h
@@ -49,6 +49,7 @@ typedef unsigned long long pj_uint64_t;
 #define PJ_UINT64(val)		val##LLU
 #define PJ_INT64_FMT		"L"
 
+#define PJ_UNREACHED(x)	    	
 
 #endif	/* __PJ_COMPAT_CC_MWCC_H__ */
 
diff --git a/pjlib/src/pjlib-test/exception.c b/pjlib/src/pjlib-test/exception.c
index 9a479a1b..94ab861a 100644
--- a/pjlib/src/pjlib-test/exception.c
+++ b/pjlib/src/pjlib-test/exception.c
@@ -54,13 +54,13 @@
 static int throw_id_1(void)
 {
     PJ_THROW( ID_1 );
-    return -1;
+    PJ_UNREACHED(return -1;)
 }
 
 static int throw_id_2(void)
 {
     PJ_THROW( ID_2 );
-    return -1;
+    PJ_UNREACHED(return -1;)
 }
 
 
diff --git a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
index f23350e3..86469854 100644
--- a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
+++ b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
@@ -150,7 +150,7 @@ static int worker_thread(void *arg)
         timeout.sec = 0; timeout.msec = 10;
         rc = pj_ioqueue_poll(ioqueue, &timeout);
     }
-    return 0;
+    PJ_UNREACHED(return 0;)
 }
 
 int udp_echo_srv_ioqueue(void)
diff --git a/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/pjlib/src/pjlib-test/udp_echo_srv_sync.c
index 3b0a02b3..1b4670e7 100644
--- a/pjlib/src/pjlib-test/udp_echo_srv_sync.c
+++ b/pjlib/src/pjlib-test/udp_echo_srv_sync.c
@@ -56,7 +56,7 @@ static int worker_thread(void *arg)
             continue;
         }
     }
-    return 0;
+    PJ_UNREACHED(return 0;)
 }
 
 
@@ -160,7 +160,7 @@ int echo_srv_common_loop(pj_atomic_t *bytes_counter)
                           (unsigned)(highest_bw/1000)));
         }
     }
-    return 0;
+    PJ_UNREACHED(return 0;)
 }
 
 
diff --git a/pjmedia/src/pjmedia/rtcp_xr.c b/pjmedia/src/pjmedia/rtcp_xr.c
index 0ef25383..a4cc6038 100644
--- a/pjmedia/src/pjmedia/rtcp_xr.c
+++ b/pjmedia/src/pjmedia/rtcp_xr.c
@@ -404,7 +404,8 @@ void pjmedia_rtcp_xr_rx_rtcp_xr( pjmedia_rtcp_xr_session *sess,
 
     pkt_len = pj_ntohs((pj_uint16_t)rtcp_xr->common.length);
 
-    pj_assert((pkt_len + 1) <= (size / 4));
+    if ((pkt_len + 1) > (size / 4))
+	return;
 
     /* Parse report rpt_types */
     while ((pj_int32_t*)rb_hdr < (pj_int32_t*)pkt + pkt_len)
diff --git a/pjnath/src/pjnath/turn_session.c b/pjnath/src/pjnath/turn_session.c
index 83d79e17..79cba249 100644
--- a/pjnath/src/pjnath/turn_session.c
+++ b/pjnath/src/pjnath/turn_session.c
@@ -1076,9 +1076,8 @@ static void on_session_fail( pj_turn_session *sess,
 
 	PJ_LOG(4,(sess->obj_name, "Trying next server"));
 	set_state(sess, PJ_TURN_STATE_RESOLVED);
-	break;
 
-    } while (status != PJ_SUCCESS);
+    } while (0);
 }
 
 
diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
index e5bb19fb..79235308 100644
--- a/pjsip-apps/src/pjsua/main.c
+++ b/pjsip-apps/src/pjsua/main.c
@@ -52,7 +52,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
 	    PJ_LOG(3,(THIS_FILE, "Ctrl-C detected, quitting.."));
             app_destroy();
 	    ExitProcess(1);
-            return TRUE; 
+            PJ_UNREACHED(return TRUE;)
  
         default: