swrap: Simplify swrap_remove_stale by early return

Pair-programmed-with: Michael Adam <obnox@samba.org>
Signed-off-by: Anoop C S <anoopcs@redhat.com>
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index ba289e6fbaf96866a8467f708cf7a372d82fa739..e944a3b818b49bdf8fa559d0b57a6107e3174f25 100644 (file)
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -1469,23 +1469,25 @@ static void swrap_remove_stale(int fd)
        struct socket_info *si = find_socket_info(fd);
        struct socket_info_fd *fi;
 
-       if (si != NULL) {
-               for (fi = si->fds; fi; fi = fi->next) {
-                       if (fi->fd == fd) {
-                               SWRAP_LOG(SWRAP_LOG_TRACE, "remove stale wrapper for %d", fd);
-                               SWRAP_DLIST_REMOVE(si->fds, fi);
-                               free(fi);
-                               break;
-                       }
+       if (si == NULL) {
+               return;
+       }
+
+       for (fi = si->fds; fi; fi = fi->next) {
+               if (fi->fd == fd) {
+                       SWRAP_LOG(SWRAP_LOG_TRACE, "remove stale wrapper for %d", fd);
+                       SWRAP_DLIST_REMOVE(si->fds, fi);
+                       free(fi);
+                       break;
                }
+       }
 
-               if (si->fds == NULL) {
-                       SWRAP_DLIST_REMOVE(sockets, si);
-                       if (si->un_addr.sun_path[0] != '\0') {
-                               unlink(si->un_addr.sun_path);
-                       }
-                       free(si);
+       if (si->fds == NULL) {
+               SWRAP_DLIST_REMOVE(sockets, si);
+               if (si->un_addr.sun_path[0] != '\0') {
+                       unlink(si->un_addr.sun_path);
                }
+               free(si);
        }
 }