Changeset 509 for pjproject/trunk

Timestamp:

Jun 15, 2006 11:04:33 AM (18 years ago)

Author:

bennylp

Message:

Cleanup misc compilation warnings with gcc

Location:

pjproject/trunk

Files:

• pjlib/src/pjlib-test/sock.c (modified) (1 diff)
• pjlib/src/pjlib-test/test.h (modified) (1 diff)
• pjlib/src/pjlib-test/thread.c (modified) (1 diff)
• pjlib/src/pjlib-test/timestamp.c (modified) (1 diff)
• pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c (modified) (1 diff)
• pjlib/src/pjlib-test/udp_echo_srv_sync.c (modified) (2 diffs)
• pjmedia/src/pjmedia/portaudio/pa_unix_oss.c (modified) (3 diffs)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (7 diffs)

pjproject/trunk/pjlib/src/pjlib-test/sock.c

@@ -97 +97 @@
 
     /* 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;
 

pjproject/trunk/pjlib/src/pjlib-test/test.h

@@ -22 +22 @@
 #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

pjproject/trunk/pjlib/src/pjlib-test/thread.c

@@ -73 +73 @@
     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));
 

pjproject/trunk/pjlib/src/pjlib-test/timestamp.c

@@ -196 +196 @@
     }
 
-    sleep(0);
+    pj_thread_sleep(0);
 
     /* Mark end time. */

pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c

@@ -150 +150 @@
         rc = pj_ioqueue_poll(ioqueue, &timeout);
     }
+    return 0;
 }
 

pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_sync.c

@@ -56 +56 @@
         }
     }
+    return 0;
 }
 
@@ -159 +160 @@
         }
     }
+    return 0;
 }
 

pjproject/trunk/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c

@@ -962 +962 @@
     int temp, nativeFormat;
     int sr = (int)sampleRate;
-    PaSampleFormat availableFormats, hostFormat;
+    PaSampleFormat availableFormats = 0, hostFormat;
     int chans = component->userChannelCount;
     int frgmt;
@@ -1165 +1165 @@
     const PaDeviceInfo *inputDeviceInfo = 0, *outputDeviceInfo = 0;
     int bpInitialized = 0;
-    double inLatency, outLatency;
+    double inLatency=0, outLatency=0;
 
     /* validate platform specific flags */
@@ -1523 +1523 @@
     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 */

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -905 +905 @@
         }
     } else {
-        pjmedia_sdp_session *answer;
+        pjmedia_sdp_session *answer = NULL;
 
         status = create_answer(pool, neg->neg_local_sdp, neg->neg_remote_sdp,

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -650 +650 @@
     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;
     }
 
@@ -662 +660 @@
         pjsua_perror(THIS_FILE, "bind() error", status);
         pj_sock_close(sock);
-        goto on_return;
+        return status;
     }
 
@@ -686 +684 @@
             pjsua_perror(THIS_FILE, "Error resolving with STUN", status);
             pj_sock_close(sock);
-            goto on_return;
+            return status;
         }
 
@@ -698 +696 @@
             pjsua_perror(THIS_FILE, "Unable to resolve local host", status);
             pj_sock_close(sock);
-            goto on_return;
+            return status;
         }
 
@@ -709 +707 @@
     *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;
 }
 
@@ -750 +744 @@
 
         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;
@@ -798 +792 @@
     PJSUA_UNLOCK();
 
-    return PJ_SUCCESS;
+    return status;
 }