From 13dba7e5eebb9ddec240c49213b95bd47b6b8c45 Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 10 May 2006 19:45:45 +0000 Subject: use ast_calloc instaed of calloc, and remove a couple of duplicated error messages git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26594 f38db490-d61c-443f-a65b-d21fe96a405b --- netsock.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'netsock.c') diff --git a/netsock.c b/netsock.c index 7c77e9315..64c6bb07b 100644 --- a/netsock.c +++ b/netsock.c @@ -85,11 +85,7 @@ static void ast_netsock_destroy(struct ast_netsock *netsock) struct ast_netsock_list *ast_netsock_list_alloc(void) { - struct ast_netsock_list *res; - - res = calloc(1, sizeof(*res)); - - return res; + return ast_calloc(1, sizeof(struct ast_netsock_list)); } int ast_netsock_init(struct ast_netsock_list *list) @@ -149,27 +145,24 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i if (setsockopt(netsocket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos))) ast_log(LOG_WARNING, "Unable to set TOS to %d\n", tos); - ns = ast_calloc(1, sizeof(struct ast_netsock)); - if (ns) { - /* Establish I/O callback for socket read */ - ioref = ast_io_add(ioc, netsocket, callback, AST_IO_IN, ns); - if (!ioref) { - ast_log(LOG_WARNING, "Out of memory!\n"); - close(netsocket); - free(ns); - return NULL; - } - ASTOBJ_INIT(ns); - ns->ioref = ioref; - ns->ioc = ioc; - ns->sockfd = netsocket; - ns->data = data; - memcpy(&ns->bindaddr, bindaddr, sizeof(ns->bindaddr)); - ASTOBJ_CONTAINER_LINK(list, ns); - } else { - ast_log(LOG_WARNING, "Out of memory!\n"); + if (!(ns = ast_calloc(1, sizeof(struct ast_netsock)))) { close(netsocket); + return NULL; } + + /* Establish I/O callback for socket read */ + if (!(ioref = ast_io_add(ioc, netsocket, callback, AST_IO_IN, ns))) { + close(netsocket); + free(ns); + return NULL; + } + ASTOBJ_INIT(ns); + ns->ioref = ioref; + ns->ioc = ioc; + ns->sockfd = netsocket; + ns->data = data; + memcpy(&ns->bindaddr, bindaddr, sizeof(ns->bindaddr)); + ASTOBJ_CONTAINER_LINK(list, ns); return ns; } -- cgit v1.2.3