[svn-commits] trunk r26594 - /trunk/netsock.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed May 10 14:45:45 2006
New Revision: 26594

URL: http://svn.digium.com/view/asterisk?rev=26594&view=rev
Log:
use ast_calloc instaed of calloc, and remove a couple of duplicated
error messages

Modified:
    trunk/netsock.c

Modified: trunk/netsock.c
URL: http://svn.digium.com/view/asterisk/trunk/netsock.c?rev=26594&r1=26593&r2=26594&view=diff
==============================================================================
--- trunk/netsock.c (original)
+++ trunk/netsock.c Wed May 10 14:45:45 2006
@@ -85,11 +85,7 @@
 
 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 @@
 	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;
 }