summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@smyrno.hos.anvin.org>2005-09-30 10:47:50 -0700
committerH. Peter Anvin <hpa@smyrno.hos.anvin.org>2005-09-30 10:47:50 -0700
commit1b4713fb9e6ec614e8dbca90b1a57d5ffa2f3fde (patch)
tree1480809bfa6d8200640b790323ec5dfd4eba1f3d /daemon.c
parentd6b89e7bf882648c23bd7fd4598696087487329d (diff)
downloadgit-1b4713fb9e6ec614e8dbca90b1a57d5ffa2f3fde.tar.gz
Use xmalloc/xcalloc
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/daemon.c b/daemon.c
index b6006c7829..6298f53fcf 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,9 +474,7 @@ 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];