[Pkg-telepathy-commits] [libnice] 207/265: Small cleaning of tcp-bsd.c

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 5eafd297203a50622395c560aa1c31d1b32729bf
Author: Youness Alaoui <youness.alaoui at collabora.co.uk>
Date:   Mon Mar 31 20:36:58 2014 -0400

    Small cleaning of tcp-bsd.c
---
 socket/tcp-bsd.c | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c
index 3018832..c6f50a0 100644
--- a/socket/tcp-bsd.c
+++ b/socket/tcp-bsd.c
@@ -106,23 +106,21 @@ nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *addr)
 
   nice_address_copy_to_sockaddr (addr, &name.addr);
 
-  if (gsock == NULL) {
-    if (name.storage.ss_family == AF_UNSPEC || name.storage.ss_family == AF_INET) {
-      gsock = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM,
-          G_SOCKET_PROTOCOL_TCP, NULL);
+  if (name.storage.ss_family == AF_UNSPEC || name.storage.ss_family == AF_INET) {
+    gsock = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM,
+        G_SOCKET_PROTOCOL_TCP, NULL);
 
-      name.storage.ss_family = AF_INET;
+    name.storage.ss_family = AF_INET;
 #ifdef HAVE_SA_LEN
-      name.storage.ss_len = sizeof (struct sockaddr_in);
+    name.storage.ss_len = sizeof (struct sockaddr_in);
 #endif
-    } else if (name.storage.ss_family == AF_INET6) {
-      gsock = g_socket_new (G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_STREAM,
-          G_SOCKET_PROTOCOL_TCP, NULL);
-      name.storage.ss_family = AF_INET6;
+  } else if (name.storage.ss_family == AF_INET6) {
+    gsock = g_socket_new (G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_STREAM,
+        G_SOCKET_PROTOCOL_TCP, NULL);
+    name.storage.ss_family = AF_INET6;
 #ifdef HAVE_SA_LEN
-      name.storage.ss_len = sizeof (struct sockaddr_in6);
+    name.storage.ss_len = sizeof (struct sockaddr_in6);
 #endif
-    }
   }
 
   if (gsock == NULL) {
@@ -130,24 +128,28 @@ nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *addr)
     return NULL;
   }
 
+  gaddr = g_socket_address_new_from_native (&name.addr, sizeof (name));
+  if (gaddr == NULL) {
+    g_object_unref (gsock);
+    g_slice_free (NiceSocket, sock);
+    return NULL;
+  }
+
   /* GSocket: All socket file descriptors are set to be close-on-exec. */
   g_socket_set_blocking (gsock, false);
 
-  gaddr = g_socket_address_new_from_native (&name.addr, sizeof (name));
-
-  if (gaddr != NULL) {
-    gret = g_socket_connect (gsock, gaddr, NULL, &gerr);
-    g_object_unref (gaddr);
-  }
+  gret = g_socket_connect (gsock, gaddr, NULL, &gerr);
+  g_object_unref (gaddr);
 
   if (gret == FALSE) {
     if (g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_PENDING) == FALSE) {
+      g_error_free (gerr);
       g_socket_close (gsock, NULL);
       g_object_unref (gsock);
       g_slice_free (NiceSocket, sock);
       return NULL;
     }
-    g_error_free(gerr);
+    g_error_free (gerr);
   }
 
   gaddr = g_socket_get_local_address (gsock, NULL);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git