WPS: Merge common error paths in HTTP server
authorJouni Malinen <j@w1.fi>
Fri, 28 Aug 2015 17:33:22 +0000 (20:33 +0300)
committerJouni Malinen <j@w1.fi>
Fri, 28 Aug 2015 17:33:22 +0000 (20:33 +0300)
There is no need to maintain three separate "goto fail" cases.

Signed-off-by: Jouni Malinen <j@w1.fi>
src/wps/http_server.c

index ac088c4..507abe8 100644 (file)
@@ -277,11 +277,9 @@ struct http_server * http_server_init(struct in_addr *addr, int port,
                           "%s", srv->port, strerror(errno));
                goto fail;
        }
-       if (listen(srv->fd, 10 /* max backlog */) < 0)
-               goto fail;
-       if (fcntl(srv->fd, F_SETFL, O_NONBLOCK) < 0)
-               goto fail;
-       if (eloop_register_sock(srv->fd, EVENT_TYPE_READ, http_server_cb,
+       if (listen(srv->fd, 10 /* max backlog */) < 0 ||
+           fcntl(srv->fd, F_SETFL, O_NONBLOCK) < 0 ||
+           eloop_register_sock(srv->fd, EVENT_TYPE_READ, http_server_cb,
                                srv, NULL))
                goto fail;