about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2013-01-27 20:57:25 +0100
committerAlexander Barton <alex@barton.de>2013-02-03 21:43:29 +0100
commit3a3b3225d42ede7a062fa5e4403a7f445baf518b (patch)
treeca63328a8207cb266235fd6f966001092fa2212f
parent84a599ece472c4f2ef6d2f553addf898e0ed73f9 (diff)
downloadngircd-3a3b3225d42ede7a062fa5e4403a7f445baf518b.tar.gz
ngircd-3a3b3225d42ede7a062fa5e4403a7f445baf518b.zip
NewListener(): Code cleanup
-rw-r--r--src/ngircd/conn.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 142cf23a..07f26f31 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -620,8 +620,9 @@ NewListener(const char *listen_addr, UINT16 Port)
 
 	af = ng_ipaddr_af(&addr);
 	sock = socket(af, SOCK_STREAM, 0);
-	if( sock < 0 ) {
-		Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno));
+	if (sock < 0) {
+		Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af,
+		    strerror(errno));
 		return -1;
 	}
 
@@ -632,21 +633,22 @@ NewListener(const char *listen_addr, UINT16 Port)
 
 	if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) {
 		Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s!",
-			ng_ipaddr_tostr(&addr), Port, strerror(errno));
+		    ng_ipaddr_tostr(&addr), Port, strerror(errno));
 		close(sock);
 		return -1;
 	}
 
-	if( listen( sock, 10 ) != 0 ) {
-		Log( LOG_CRIT, "Can't listen on socket: %s!", strerror( errno ));
-		close( sock );
+	if (listen(sock, 10) != 0) {
+		Log(LOG_CRIT, "Can't listen on socket: %s!", strerror(errno));
+		close(sock);
 		return -1;
 	}
 
 	/* keep fd in list so we can close it when ngircd restarts/shuts down */
-	if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) {
-		Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno ));
-		close( sock );
+	if (!array_catb(&My_Listeners, (char *)&sock, sizeof(int))) {
+		Log(LOG_CRIT, "Can't add socket to My_Listeners array: %s!",
+		    strerror(errno));
+		close(sock);
 		return -1;
 	}