diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-03-31 12:51:25 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-03-31 12:51:25 +0100 |
| commit | 4954d623ded198d84627a0fb1e68fc01a87a614d (patch) | |
| tree | 6ac0ee86fc128005bd077467e7473f46bf6235cd | |
| parent | 8bf6429267893fa57875f808c37545d52c9094df (diff) | |
| parent | d9e4510224f022c5e720582d27aa0388569874bc (diff) | |
| download | php-git-4954d623ded198d84627a0fb1e68fc01a87a614d.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
remove unused params || woops
| -rw-r--r-- | main/network.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/network.c b/main/network.c index 6d1d97bc82..e7f1b84281 100644 --- a/main/network.c +++ b/main/network.c @@ -176,8 +176,6 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka # endif struct addrinfo hints, *res, *sai; #else - char *tmp_host_buf = NULL; - struct hostent tmp_host_info; struct hostent *host_info; struct in_addr in; #endif @@ -251,7 +249,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka host_info = NULL; errno = E2BIG; } else { - host_info = php_network_gethostbyname(host, &tmp_host_info, &tmp_host_buf); + host_info = php_network_gethostbyname(host); } if (host_info == NULL) { if (error_string) { @@ -272,9 +270,6 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka ((struct sockaddr_in *)*sap)->sin_addr = in; sap++; n = 1; - if (tmp_host_buf) { - efree(tmp_host_buf); - } #endif *sap = NULL; |