From: Antony Dovgal <tony2001@php.net>
Date: Sun, 30 Jul 2006 19:15:25 +0000 (+0000)
Subject: temporarily revert the patch by request of Derick
X-Git-Tag: php-4.4.4RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d98d470f55aea4f48bd75376caff42a82e7bfbc4;p=php

temporarily revert the patch by request of Derick
---

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 561dc775e0..0fd2387294 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -515,7 +515,6 @@ PHP_RSHUTDOWN_FUNCTION(sockets)
 int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd TSRMLS_DC) {
 	zval		**element;
 	php_socket	*php_sock;
-	int			num = 0;
 	
 	if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -530,10 +529,9 @@ int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd TSRML
 		if (php_sock->bsd_socket > *max_fd) {
 			*max_fd = php_sock->bsd_socket;
 		}
-		num++;
 	}
 
-	return num ? 1 : 0;
+	return 1;
 }
 
 int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
@@ -541,7 +539,6 @@ int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
 	zval		**dest_element;
 	php_socket	*php_sock;
 	HashTable	*new_hash;
-	int			num = 0;
 
 	if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -559,7 +556,6 @@ int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
 			zend_hash_next_index_insert(new_hash, (void *)element, sizeof(zval *), (void **)&dest_element);
 			if (dest_element) zval_add_ref(dest_element);
 		}
-		num++;
 	}
 
 	/* Destroy old array, add new one */
@@ -569,7 +565,7 @@ int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
 	zend_hash_internal_pointer_reset(new_hash);
 	Z_ARRVAL_P(sock_array) = new_hash;
 
-	return num ? 1 : 0;
+	return 1;
 }