From: Jouni Malinen <j@w1.fi>
Date: Fri, 28 Aug 2015 17:33:22 +0000 (+0300)
Subject: WPS: Merge common error paths in HTTP server
X-Git-Tag: hostap_2_5~95
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=f79a19746a4bdc1a9ae3d802eb10bc8398bc9e23;p=mech_eap.git

WPS: Merge common error paths in HTTP server

There is no need to maintain three separate "goto fail" cases.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/wps/http_server.c b/src/wps/http_server.c
index ac088c4..507abe8 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;