From: H. Peter Anvin Date: Fri, 30 Sep 2005 17:47:50 +0000 (-0700) Subject: Use xmalloc/xcalloc X-Git-Tag: v0.99.9~208 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b4713fb9e6ec614e8dbca90b1a57d5ffa2f3fde;p=git.git Use xmalloc/xcalloc --- diff --git a/daemon.c b/daemon.c index b6006c782..6298f53fc 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];