fix two memory leaks

[catta] / socket.c

diff --git a/socket.c b/socket.c
index e6cf40f4e5b909f7da94145b4608bc25dd49ba13..48a5d4b57d89d23c463e8ee8817d8e7e11cb5562 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -50,10 +50,10 @@ int flx_mdns_mcast_join_ipv4 (int index, int fd)
  
     if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
         g_warning("IP_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
-        return 0;
-    } else {
         return -1;
-    }
+    } 
+
+    return 0;
 }
 
 int flx_mdns_mcast_join_ipv6 (int index, int fd)
@@ -61,7 +61,6 @@ int flx_mdns_mcast_join_ipv6 (int index, int fd)
     struct ipv6_mreq mreq6; 
     struct sockaddr_in6 sa6;
 
-
     mdns_mcast_group_ipv6 (&sa6);
 
     memset(&mreq6, 0, sizeof(mreq6));
@@ -70,10 +69,10 @@ int flx_mdns_mcast_join_ipv6 (int index, int fd)
 
     if (setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
         g_warning("IPV6_ADD_MEMBERSHIP failed: %s\n", strerror(errno));
-        return 0;
-    } else {
         return -1;
     }
+
+    return 0;
 }
 
 int flx_mdns_mcast_leave_ipv4 (int index, int fd)
@@ -89,10 +88,10 @@ int flx_mdns_mcast_leave_ipv4 (int index, int fd)
  
     if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
         g_warning("IP_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
-        return 0;
-    } else {
         return -1;
     }
+
+    return 0;
 }
 
 int flx_mdns_mcast_leave_ipv6 (int index, int fd)
@@ -108,10 +107,10 @@ int flx_mdns_mcast_leave_ipv6 (int index, int fd)
 
     if (setsockopt(fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
         g_warning("IPV6_DROP_MEMBERSHIP failed: %s\n", strerror(errno));
-        return 0;
-    } else {
         return -1;
     }
+
+    return 0;
 }
 
 gint flx_open_socket_ipv4(void) {