diff options
| author | Chris Wright <daverandom@php.net> | 2018-03-29 12:41:50 +0100 |
|---|---|---|
| committer | Chris Wright <daverandom@php.net> | 2018-04-03 14:51:47 +0100 |
| commit | 658a23a9741f6812fcbce32b2811db348edbe91e (patch) | |
| tree | b12b029736d83ff85c3bd8d85882d0a7421acfbe /ext | |
| parent | 8e6d7f0d8f9f9ce057884833d996ea2822460a42 (diff) | |
| download | php-git-658a23a9741f6812fcbce32b2811db348edbe91e.tar.gz | |
Remove warnings from inet_pton()/inet_ntop()
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/network/inet.phpt | 20 | ||||
| -rw-r--r-- | ext/standard/tests/network/inet_ipv6.phpt | 4 |
3 files changed, 4 insertions, 24 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 01fb765be3..e1a08f4d75 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3944,12 +3944,10 @@ PHP_NAMED_FUNCTION(zif_inet_ntop) } else #endif if (address_len != 4) { - php_error_docref(NULL, E_WARNING, "Invalid in_addr value"); RETURN_FALSE; } if (!inet_ntop(af, address, buffer, sizeof(buffer))) { - php_error_docref(NULL, E_WARNING, "An unknown error occurred"); RETURN_FALSE; } @@ -3980,14 +3978,12 @@ PHP_NAMED_FUNCTION(php_inet_pton) } else #endif if (!strchr(address, '.')) { - php_error_docref(NULL, E_WARNING, "Unrecognized address %s", address); RETURN_FALSE; } ret = inet_pton(af, address, buffer); if (ret <= 0) { - php_error_docref(NULL, E_WARNING, "Unrecognized address %s", address); RETURN_FALSE; } diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt index 10b4dad0a6..1bbcae4ef8 100644 --- a/ext/standard/tests/network/inet.phpt +++ b/ext/standard/tests/network/inet.phpt @@ -43,33 +43,21 @@ string(13) "255.255.255.0" Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d bool(false) - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) Warning: inet_pton() expects exactly 1 parameter, 0 given in %s on line %d bool(false) - -Warning: inet_pton(): Unrecognized address in %s on line %d bool(false) - -Warning: inet_pton(): Unrecognized address -1 in %s on line %d bool(false) - -Warning: inet_pton(): Unrecognized address abra in %s on line %d bool(false) -string(%d) "7f000001" +string(8) "7f000001" string(9) "127.0.0.1" -string(%d) "42a3a174" +string(8) "42a3a174" string(14) "66.163.161.116" -string(%d) "ffffffff" +string(8) "ffffffff" string(15) "255.255.255.255" -string(%d) "00000000" +string(8) "00000000" string(7) "0.0.0.0" Done diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt index 3b280dfec7..488f267bf6 100644 --- a/ext/standard/tests/network/inet_ipv6.phpt +++ b/ext/standard/tests/network/inet_ipv6.phpt @@ -39,10 +39,6 @@ string(3) "::2" string(4) "::35" string(5) "::255" string(6) "::1024" - -Warning: inet_pton(): Unrecognized address in %s on line %d - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) string(36) "2001:db8:85a3:8d3:1319:8a2e:370:7344" string(15) "2001:db8:1234::" |