cvs: php-src /main network.c /main/streams xp_socket.c

iliaa Sun Nov 30 14:43:30 2003 EDT Modified files: /php-src/main network.c /php-src/main/streams xp_socket.c Log: Removed unused variables. Index: php-src/main/network.c diff -u php-src/main/network.c:1.104 php-src/main/network.c:1.105 --- php-src/main/network.c:1.104 Sat Nov 29 16:46:49 2003 +++ php-src/main/network.c Sun Nov 30 14:43:28 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.104 2003/11/29 21:46:49 wez Exp $ */ +/* $Id: network.c,v 1.105 2003/11/30 19:43:28 iliaa Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -481,17 +481,14 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, long addrlen, struct sockaddr *sa, socklen_t *sl TSRMLS_DC) { char *colon; - char *host = NULL; - int is_v6; char *tmp; int ret = FAILURE; short port; struct sockaddr_in *in4 = (struct sockaddr_in*)sa; - struct sockaddr **sal, **psal; + struct sockaddr **psal; int n; char *errstr = NULL; #ifdef HAVE_IPV6 - char *p; struct sockaddr_in6 *in6 = (struct sockaddr_in6*)sa; #endif Index: php-src/main/streams/xp_socket.c diff -u php-src/main/streams/xp_socket.c:1.18 php-src/main/streams/xp_socket.c:1.19 --- php-src/main/streams/xp_socket.c:1.18 Sat Nov 29 16:46:50 2003 +++ php-src/main/streams/xp_socket.c Sun Nov 30 14:43:30 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_socket.c,v 1.18 2003/11/29 21:46:50 wez Exp $ */ +/* $Id: xp_socket.c,v 1.19 2003/11/30 19:43:30 iliaa Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -141,9 +141,11 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; +#ifdef PHP_WIN32 fd_set wrfds, efds; int n; struct timeval timeout; +#endif if (close_handle) {