diff src/lib/network.c @ 14629:c93ca5e46a8a

Marked functions parameters that are allowed to be NULL. Some APIs were also changed. The non-obvious APIs where NULL parameter was changed to "" are master_service_init() and auth_master_user_list_init(). These checks can currently be enabled only on a patched clang: http://llvm.org/bugs/show_bug.cgi?id=6786
author Timo Sirainen <tss@iki.fi>
date Sun, 24 Jun 2012 00:52:57 +0300
parents fbb1ecb9b888
children a65006d95d53
line wrap: on
line diff
--- a/src/lib/network.c	Fri Jun 22 21:59:01 2012 +0300
+++ b/src/lib/network.c	Sun Jun 24 00:52:57 2012 +0300
@@ -500,7 +500,7 @@
 	return fd;
 }
 
-int net_accept(int fd, struct ip_addr *addr, unsigned int *port)
+int net_accept(int fd, struct ip_addr *addr_r, unsigned int *port_r)
 {
 	union sockaddr_union so;
 	int ret;
@@ -518,12 +518,12 @@
 			return -2;
 	}
 	if (so.sin.sin_family == AF_UNIX) {
-		if (addr != NULL)
-			memset(addr, 0, sizeof(*addr));
-		if (port != NULL) *port = 0;
+		if (addr_r != NULL)
+			memset(addr_r, 0, sizeof(*addr_r));
+		if (port_r != NULL) *port_r = 0;
 	} else {
-		if (addr != NULL) sin_get_ip(&so, addr);
-		if (port != NULL) *port = sin_get_port(&so);
+		if (addr_r != NULL) sin_get_ip(&so, addr_r);
+		if (port_r != NULL) *port_r = sin_get_port(&so);
 	}
 	return ret;
 }