X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=daemon.c;h=f285a8c98ca9fbfc421b735f76f9d9f2248bd749;hb=8b73edf498adf2895af7ff9c750283cf9325a632;hp=b6006c78291d1376a057f5a41f5f07b0f6b24111;hpb=d6b89e7bf882648c23bd7fd4598696087487329d;p=git.git

diff --git a/daemon.c b/daemon.c
index b6006c78..f285a8c9 100644
--- a/daemon.c
+++ b/daemon.c
@@ -463,9 +463,7 @@ static int socksetup(int port, int **socklist_p)
 		return 0;
 	}
 
-	*socklist_p = malloc(sizeof(int));
-	if ( !*socklist_p )
-		die("memory allocation failed: %s", strerror(errno));
+	*socklist_p = xmalloc(sizeof(int));
 	**socklist_p = sockfd;
 }
 
@@ -476,14 +474,14 @@ static int service_loop(int socknum, int *socklist)
 	struct pollfd *pfd;
 	int i;
 
-	pfd = calloc(socknum, sizeof(struct pollfd));
-	if (!pfd)
-		die("memory allocation failed: %s", strerror(errno));
+	pfd = xcalloc(socknum, sizeof(struct pollfd));
 
 	for (i = 0; i < socknum; i++) {
 		pfd[i].fd = socklist[i];
 		pfd[i].events = POLLIN;
 	}
+
+	signal(SIGCHLD, child_handler);
 	
 	for (;;) {
 		int i;
@@ -500,7 +498,7 @@ static int service_loop(int socknum, int *socklist)
 		for (i = 0; i < socknum; i++) {
 			if (pfd[i].revents & POLLIN) {
 				struct sockaddr_storage ss;
-				int sslen = sizeof(ss);
+				unsigned int sslen = sizeof(ss);
 				int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen);
 				if (incoming < 0) {
 					switch (errno) {
@@ -522,8 +520,6 @@ static int serve(int port)
 {
 	int socknum, *socklist;
 	
-	signal(SIGCHLD, child_handler);
-	
 	socknum = socksetup(port, &socklist);
 	if (socknum == 0)
 		die("unable to allocate any listen sockets on port %u", port);