diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /main/network.c | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'main/network.c')
| -rw-r--r-- | main/network.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/main/network.c b/main/network.c index a21e8a5ee6..d8824fd81e 100644 --- a/main/network.c +++ b/main/network.c @@ -647,7 +647,6 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock, { php_sockaddr_storage sa; socklen_t sl = sizeof(sa); - memset(&sa, 0, sizeof(sa)); if (getpeername(sock, (struct sockaddr*)&sa, &sl) == 0) { php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, @@ -667,7 +666,6 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock, { php_sockaddr_storage sa; socklen_t sl = sizeof(sa); - memset(&sa, 0, sizeof(sa)); if (getsockname(sock, (struct sockaddr*)&sa, &sl) == 0) { php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, @@ -1059,11 +1057,7 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC) /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */ flags = !block; if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) { - char *error_string; - - error_string = php_socket_strerror(WSAGetLastError(), NULL, 0); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", error_string); - efree(error_string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", WSAGetLastError()); ret = FAILURE; } #else |