Changeset 509 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

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

Author:

bennylp

Message:

Cleanup misc compilation warnings with gcc

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (7 diffs)

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;
 }