Convert php_network_getaddress* to use unsigned size_t

Since this can never return -1 (0 on error/none, >0 for addresses)

Author: NattyNarwhal

ext/snmp/snmp.c

@@ -832,7 +832,7 @@ static bool snmp_session_init(php_snmp_session **session_p, int version, zend_st
 	php_snmp_session *session;
 	char *pptr, *host_ptr;
 	bool force_ipv6 = false;
-	int n;
+	size_t n;
 	struct sockaddr **psal;
 	struct sockaddr **res;
 

ext/standard/dns.c

@@ -233,7 +233,7 @@ PHP_FUNCTION(gethostbyname)
 	}
 
 	php_sockaddr_storage resolved;
-	int address_count = php_network_getaddress(&resolved, hostname, 0, AF_INET, 0, NULL);
+	size_t address_count = php_network_getaddress(&resolved, hostname, 0, AF_INET, 0, NULL);
 	if (address_count == 0) {
 		/* don't need to docref here, getaddresses E_WARNINGs for us */
 		RETURN_STRINGL(hostname, hostname_len);
@@ -276,7 +276,7 @@ PHP_FUNCTION(gethostbynamel)
 	}
 
 	struct sockaddr **addresses = NULL;
-	int address_count = php_network_getaddresses(hostname, 0, &addresses, NULL);
+	size_t address_count = php_network_getaddresses(hostname, 0, &addresses, NULL);
 	if (address_count == 0) {
 		/* don't need to docref here, getaddresses E_WARNINGs for us */
 		RETURN_FALSE;

main/fastcgi.c

@@ -683,7 +683,7 @@ int fcgi_listen(const char *path, int backlog)
 		} else {
 			if (!inet_pton(AF_INET, host, &sa.sa_inet.sin_addr)) {
 				php_sockaddr_storage resolved;
-				int address_count;
+				size_t address_count;
 
 				if (strlen(host) > MAXFQDNLEN) {
 					address_count = 0;

main/network.c

@@ -145,10 +145,11 @@ PHPAPI void php_network_freeaddresses(struct sockaddr **sal)
 /* {{{ php_network_getaddresses_ex
  * Returns number of addresses, 0 for none/error
  */
-PHPAPI int php_network_getaddresses_ex(const char *host, int socktype, int family, int ai_flags, struct sockaddr ***sal, zend_string **error_string)
+PHPAPI size_t php_network_getaddresses_ex(const char *host, int socktype, int family, int ai_flags, struct sockaddr ***sal, zend_string **error_string)
 {
 	struct sockaddr **sap;
-	int n;
+	size_t n;
+	int ret;
 #ifdef HAVE_GETADDRINFO
 # ifdef HAVE_IPV6
 	static int ipv6_borked = -1; /* the way this is used *is* thread safe */
@@ -190,7 +191,7 @@ PHPAPI int php_network_getaddresses_ex(const char *host, int socktype, int famil
 	hints.ai_family = ipv6_borked ? AF_INET : family;
 # endif
 
-	if ((n = getaddrinfo(host, NULL, &hints, &res))) {
+	if ((ret = getaddrinfo(host, NULL, &hints, &res))) {
 # if defined(PHP_WIN32)
 		char *gai_error = php_win32_error_to_msg(n);
 # elif defined(HAVE_GAI_STRERROR)
@@ -253,7 +254,7 @@ PHPAPI int php_network_getaddresses_ex(const char *host, int socktype, int famil
 /* {{{ php_network_getaddresses
  * Returns number of addresses, 0 for none/error
  */
-PHPAPI int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, zend_string **error_string)
+PHPAPI size_t php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, zend_string **error_string)
 {
 	return php_network_getaddresses_ex(host, socktype, AF_UNSPEC, 0, sal, error_string);
 }
@@ -262,10 +263,10 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
 /* {{{ php_network_getaddress
  * Returns the number of addresses, and puts first address for a hostname in sockaddr.
  */
-PHPAPI int php_network_getaddress(php_sockaddr_storage *sockaddr, const char *host, int socktype, int family, int ai_flags, zend_string **error_string)
+PHPAPI size_t php_network_getaddress(php_sockaddr_storage *sockaddr, const char *host, int socktype, int family, int ai_flags, zend_string **error_string)
 {
 	struct sockaddr** addresses;
-	int address_count = php_network_getaddresses_ex(host, socktype, family, ai_flags, &addresses, error_string);
+	size_t address_count = php_network_getaddresses_ex(host, socktype, family, ai_flags, &addresses, error_string);
 	if (address_count == 0) {
 		return 0;
 	}

main/php_network.h

@@ -285,10 +285,10 @@ typedef struct {
 } php_sockvals;
 
 BEGIN_EXTERN_C()
-PHPAPI int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, zend_string **error_string);
-PHPAPI int php_network_getaddresses_ex(const char *host, int socktype, int family, int ai_flags, struct sockaddr ***sal, zend_string **error_string);
+PHPAPI size_t php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, zend_string **error_string);
+PHPAPI size_t php_network_getaddresses_ex(const char *host, int socktype, int family, int ai_flags, struct sockaddr ***sal, zend_string **error_string);
 PHPAPI void php_network_freeaddresses(struct sockaddr **sal);
-PHPAPI int php_network_getaddress(php_sockaddr_storage *sockaddr, const char *host, int socktype, int family, int ai_flags, zend_string **error_string);
+PHPAPI size_t php_network_getaddress(php_sockaddr_storage *sockaddr, const char *host, int socktype, int family, int ai_flags, zend_string **error_string);
 
 PHPAPI php_socket_t php_network_connect_socket_to_host_ex(const char *host, unsigned short port,
 		int socktype, int asynchronous, struct timeval *timeout, zend_string **error_string,

sapi/cli/php_cli_server.c

@@ -1275,7 +1275,7 @@ static php_socket_t php_network_listen_socket(const char *host, int *port, int s
 	int err = 0;
 	struct sockaddr *sa = NULL, **p, **sal;
 
-	int num_addrs = php_network_getaddresses(host, socktype, &sal, errstr);
+	size_t num_addrs = php_network_getaddresses(host, socktype, &sal, errstr);
 	if (num_addrs == 0) {
 		return -1;
 	}