Cleanup misc compilation warnings with gcc

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

9 files changed, 24 insertions, 26 deletions

diff --git a/pjlib/src/pjlib-test/sock.c b/pjlib/src/pjlib-test/sock.c
index fb689169..1bdd637e 100644
--- a/pjlib/src/pjlib-test/sock.c
+++ b/pjlib/src/pjlib-test/sock.c
@@ -96,11 +96,11 @@ static int format_test(void)
     }
 
     /* pj_inet_ntoa() */
-    p = pj_inet_ntoa(addr);
+    p = (unsigned char*) pj_inet_ntoa(addr);
     if (!p)
 	return -20;
 
-    if (pj_strcmp2(&s, p) != 0)
+    if (pj_strcmp2(&s, (char*)p) != 0)
 	return -30;
 
     /* pj_gethostname() */
diff --git a/pjlib/src/pjlib-test/test.h b/pjlib/src/pjlib-test/test.h
index 78478df6..53400e23 100644
--- a/pjlib/src/pjlib-test/test.h
+++ b/pjlib/src/pjlib-test/test.h
@@ -21,11 +21,11 @@
 
 #include <pj/types.h>
 
-#define GROUP_LIBC                  0
-#define GROUP_OS                    0
-#define GROUP_DATA_STRUCTURE        0
-#define GROUP_NETWORK               0
-#define GROUP_FILE                  0
+#define GROUP_LIBC                  1
+#define GROUP_OS                    1
+#define GROUP_DATA_STRUCTURE        1
+#define GROUP_NETWORK               1
+#define GROUP_FILE                  1
 
 #define INCLUDE_ERRNO_TEST          GROUP_LIBC
 #define INCLUDE_TIMESTAMP_TEST      GROUP_OS
diff --git a/pjlib/src/pjlib-test/thread.c b/pjlib/src/pjlib-test/thread.c
index 866c7698..dc0caed2 100644
--- a/pjlib/src/pjlib-test/thread.c
+++ b/pjlib/src/pjlib-test/thread.c
@@ -72,9 +72,10 @@ static void* thread_proc(pj_uint32_t *pcounter)
     /* Test that pj_thread_register() works. */
     pj_thread_desc desc;
     pj_thread_t *this_thread;
-    unsigned id = *pcounter;
+    unsigned id;
     pj_status_t rc;
 
+    id = *pcounter;
     TRACE__((THIS_FILE, "     thread %d running..", id));
 
     rc = pj_thread_register("thread", desc, &this_thread);
diff --git a/pjlib/src/pjlib-test/timestamp.c b/pjlib/src/pjlib-test/timestamp.c
index f7ff7874..285b2a3c 100644
--- a/pjlib/src/pjlib-test/timestamp.c
+++ b/pjlib/src/pjlib-test/timestamp.c
@@ -195,7 +195,7 @@ int timestamp_test(void)
 	null_func();
     }
 
-    sleep(0);
+    pj_thread_sleep(0);
 
     /* Mark end time. */
     pj_get_timestamp(&t2);
diff --git a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
index 8ede493b..50db4931 100644
--- a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
+++ b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
@@ -149,6 +149,7 @@ static int worker_thread(void *arg)
         timeout.sec = 0; timeout.msec = 10;
         rc = pj_ioqueue_poll(ioqueue, &timeout);
     }
+    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 34633de2..0cca64e7 100644
--- a/pjlib/src/pjlib-test/udp_echo_srv_sync.c
+++ b/pjlib/src/pjlib-test/udp_echo_srv_sync.c
@@ -55,6 +55,7 @@ static int worker_thread(void *arg)
             continue;
         }
     }
+    return 0;
 }
 
 
@@ -158,6 +159,7 @@ int echo_srv_common_loop(pj_atomic_t *bytes_counter)
                           (unsigned)(highest_bw/1000)));
         }
     }
+    return 0;
 }
 
 
diff --git a/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c b/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c
index 45c49da0..20b562aa 100644
--- a/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c
+++ b/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c
@@ -961,7 +961,7 @@ static PaError PaOssStreamComponent_Configure( PaOssStreamComponent *component,
     PaError result = paNoError;
     int temp, nativeFormat;
     int sr = (int)sampleRate;
-    PaSampleFormat availableFormats, hostFormat;
+    PaSampleFormat availableFormats = 0, hostFormat;
     int chans = component->userChannelCount;
     int frgmt;
     int numBufs;
@@ -1164,7 +1164,7 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
     PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0, inputHostFormat = 0, outputHostFormat = 0;
     const PaDeviceInfo *inputDeviceInfo = 0, *outputDeviceInfo = 0;
     int bpInitialized = 0;
-    double inLatency, outLatency;
+    double inLatency=0, outLatency=0;
 
     /* validate platform specific flags */
     if( (streamFlags & paPlatformSpecificFlags) != 0 )
@@ -1522,7 +1522,7 @@ static void *PaOSS_AudioThreadProc( void *userData )
 {
     PaError result = paNoError;
     PaOssStream *stream = (PaOssStream*)userData;
-    unsigned long framesAvail, framesProcessed;
+    unsigned long framesAvail=0, framesProcessed;
     int callbackResult = paContinue;
     int triggered = stream->triggered;  /* See if SNDCTL_DSP_TRIGGER has been issued already */
     int initiateProcessing = triggered;    /* Already triggered? */
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
index 41383d6d..97ec4c35 100644
--- a/pjmedia/src/pjmedia/sdp_neg.c
+++ b/pjmedia/src/pjmedia/sdp_neg.c
@@ -904,7 +904,7 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_negotiate( pj_pool_t *pool,
 
 	}
     } else {
-	pjmedia_sdp_session *answer;
+	pjmedia_sdp_session *answer = NULL;
 
 	status = create_answer(pool, neg->neg_local_sdp, neg->neg_remote_sdp,
 			       &answer);
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index e269fa07..72c14c00 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -649,19 +649,17 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr,
     pj_sock_t sock;
     pj_status_t status;
 
-    PJSUA_LOCK();
-
     status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock);
     if (status != PJ_SUCCESS) {
 	pjsua_perror(THIS_FILE, "socket() error", status);
-	goto on_return;
+	return status;
     }
 
     status = pj_sock_bind_in(sock, bound_addr.s_addr, (pj_uint16_t)port);
     if (status != PJ_SUCCESS) {
 	pjsua_perror(THIS_FILE, "bind() error", status);
 	pj_sock_close(sock);
-	goto on_return;
+	return status;
     }
 
     /* Copy and normalize STUN param */
@@ -685,7 +683,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr,
 	if (status != PJ_SUCCESS) {
 	    pjsua_perror(THIS_FILE, "Error resolving with STUN", status);
 	    pj_sock_close(sock);
-	    goto on_return;
+	    return status;
 	}
 
     } else {
@@ -697,7 +695,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr,
 	if (status != PJ_SUCCESS) {
 	    pjsua_perror(THIS_FILE, "Unable to resolve local host", status);
 	    pj_sock_close(sock);
-	    goto on_return;
+	    return status;
 	}
 
 	pj_memset(p_pub_addr, 0, sizeof(pj_sockaddr_in));
@@ -708,15 +706,11 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr,
 
     *p_sock = sock;
 
-on_return:
-
-    PJSUA_UNLOCK();
-
     PJ_LOG(4,(THIS_FILE, "SIP UDP socket reachable at %s:%d",
 	      pj_inet_ntoa(p_pub_addr->sin_addr),
 	      (int)pj_ntohs(p_pub_addr->sin_port)));
 
-    return status;
+    return PJ_SUCCESS;
 }
 
 
@@ -749,7 +743,7 @@ PJ_DEF(pj_status_t) pjsua_transport_create( pjsip_transport_type_e type,
     if (type == PJSIP_TRANSPORT_UDP) {
 
 	pjsua_transport_config config;
-	pj_sock_t sock;
+	pj_sock_t sock = PJ_INVALID_SOCKET;
 	pj_sockaddr_in pub_addr;
 	pjsip_host_port addr_name;
 
@@ -797,7 +791,7 @@ on_return:
 
     PJSUA_UNLOCK();
 
-    return PJ_SUCCESS;
+    return status;
 }