From f79a19746a4bdc1a9ae3d802eb10bc8398bc9e23 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 28 Aug 2015 20:33:22 +0300 Subject: [PATCH] WPS: Merge common error paths in HTTP server There is no need to maintain three separate "goto fail" cases. Signed-off-by: Jouni Malinen --- src/wps/http_server.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/wps/http_server.c b/src/wps/http_server.c index ac088c429..507abe870 100644 --- a/src/wps/http_server.c +++ b/src/wps/http_server.c @@ -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; -- 2.47.2