iliaa Wed Apr 29 22:06:28 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard basic_functions.c /php-src/ext/standard/tests/network ip2long_error.phpt ip2long_variation1.phpt ip_x86_64.phpt long2ip_error.phpt long2ip_variation1.phpt Log: Update tests to accomodate new parameter parsing API and make long2ip() use it as well
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.81&r2=1.725.2.31.2.82&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.81 php-src/ext/standard/basic_functions.c:1.725.2.31.2.82 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.81 Tue Apr 28 22:31:25 2009 +++ php-src/ext/standard/basic_functions.c Wed Apr 29 22:06:28 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.81 2009/04/28 22:31:25 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.82 2009/04/29 22:06:28 iliaa Exp $ */ #include "php.h" #include "php_streams.h" @@ -4372,16 +4372,17 @@ Converts an (IPv4) Internet network address into a string in Internet standard dotted format */ PHP_FUNCTION(long2ip) { - zval **num; + /* "It's a long but it's not, PHP ints are signed */ + char *ip; + int ip_len; unsigned long n; struct in_addr myaddr; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ip, &ip_len) == FAILURE) { + return; } - convert_to_string_ex(num); - - n = strtoul(Z_STRVAL_PP(num), NULL, 0); + + n = strtoul(ip, NULL, 0); myaddr.s_addr = htonl(n); RETURN_STRING(inet_ntoa(myaddr), 1); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip2long_error.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/standard/tests/network/ip2long_error.phpt diff -u php-src/ext/standard/tests/network/ip2long_error.phpt:1.2.2.2 php-src/ext/standard/tests/network/ip2long_error.phpt:1.2.2.3 --- php-src/ext/standard/tests/network/ip2long_error.phpt:1.2.2.2 Fri Jan 23 15:34:24 2009 +++ php-src/ext/standard/tests/network/ip2long_error.phpt Wed Apr 29 22:06:28 2009 @@ -27,11 +27,11 @@ -- Testing ip2long() function with Zero arguments -- -Warning: Wrong parameter count for ip2long() in %s on line %d +Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d NULL -- Testing ip2long() function with more than expected no. of arguments -- -Warning: Wrong parameter count for ip2long() in %s on line %d +Warning: ip2long() expects exactly 1 parameter, 2 given in %s on line %d NULL ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip2long_variation1.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u Index: php-src/ext/standard/tests/network/ip2long_variation1.phpt diff -u php-src/ext/standard/tests/network/ip2long_variation1.phpt:1.2.2.3 php-src/ext/standard/tests/network/ip2long_variation1.phpt:1.2.2.4 --- php-src/ext/standard/tests/network/ip2long_variation1.phpt:1.2.2.3 Tue Apr 28 22:31:25 2009 +++ php-src/ext/standard/tests/network/ip2long_variation1.phpt Wed Apr 29 22:06:28 2009 @@ -141,20 +141,20 @@ bool(false) --empty array-- -Error: 8 - Array to string conversion, %s(%d) -bool(false) +Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d) +NULL --int indexed array-- -Error: 8 - Array to string conversion, %s(%d) -bool(false) +Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d) +NULL --associative array-- -Error: 8 - Array to string conversion, %s(%d) -bool(false) +Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d) +NULL --nested arrays-- -Error: 8 - Array to string conversion, %s(%d) -bool(false) +Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d) +NULL --uppercase NULL-- bool(false) @@ -184,9 +184,8 @@ bool(false) --instance of classWithoutToString-- -Error: 4096 - Object of class classWithoutToString could not be converted to string, %s(%d) -Error: 8 - Object of class classWithoutToString to string conversion, %s(%d) -bool(false) +Error: 2 - ip2long() expects parameter 1 to be string, object given, %s(%d) +NULL --undefined var-- bool(false) @@ -195,5 +194,6 @@ bool(false) --resource-- -bool(false) +Error: 2 - ip2long() expects parameter 1 to be string, resource given, %s(%d) +NULL ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip_x86_64.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/network/ip_x86_64.phpt diff -u php-src/ext/standard/tests/network/ip_x86_64.phpt:1.1.2.2 php-src/ext/standard/tests/network/ip_x86_64.phpt:1.1.2.3 --- php-src/ext/standard/tests/network/ip_x86_64.phpt:1.1.2.2 Sat Sep 1 18:38:39 2007 +++ php-src/ext/standard/tests/network/ip_x86_64.phpt Wed Apr 29 22:06:28 2009 @@ -48,20 +48,20 @@ int(1118019956) string(14) "66.163.161.116" -Warning: Wrong parameter count for ip2long() in %s on line %d +Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d NULL bool(false) bool(false) int(1869573999) -Notice: Array to string conversion in %s on line %d -bool(false) +Warning: ip2long() expects parameter 1 to be string, array given in %s on line %d +NULL -Warning: Wrong parameter count for long2ip() in %s on line %d +Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d NULL string(13) "255.254.82.80" string(7) "0.0.0.0" -Notice: Array to string conversion in %s on line %d -string(7) "0.0.0.0" +Warning: long2ip() expects parameter 1 to be string, array given in %s on line %d +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/long2ip_error.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/standard/tests/network/long2ip_error.phpt diff -u php-src/ext/standard/tests/network/long2ip_error.phpt:1.2.2.2 php-src/ext/standard/tests/network/long2ip_error.phpt:1.2.2.3 --- php-src/ext/standard/tests/network/long2ip_error.phpt:1.2.2.2 Fri Jan 23 15:34:24 2009 +++ php-src/ext/standard/tests/network/long2ip_error.phpt Wed Apr 29 22:06:28 2009 @@ -27,11 +27,11 @@ -- Testing long2ip() function with Zero arguments -- -Warning: Wrong parameter count for long2ip() in %s on line %d +Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d NULL -- Testing long2ip() function with more than expected no. of arguments -- -Warning: Wrong parameter count for long2ip() in %s on line %d +Warning: long2ip() expects exactly 1 parameter, 2 given in %s on line %d NULL ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/long2ip_variation1.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/standard/tests/network/long2ip_variation1.phpt diff -u php-src/ext/standard/tests/network/long2ip_variation1.phpt:1.2.2.2 php-src/ext/standard/tests/network/long2ip_variation1.phpt:1.2.2.3 --- php-src/ext/standard/tests/network/long2ip_variation1.phpt:1.2.2.2 Fri Jan 23 15:34:24 2009 +++ php-src/ext/standard/tests/network/long2ip_variation1.phpt Wed Apr 29 22:06:28 2009 @@ -126,20 +126,20 @@ string(7) "0.0.0.0" --empty array-- -Error: 8 - Array to string conversion, %s(%d) -string(7) "0.0.0.0" +Error: 2 - long2ip() expects parameter 1 to be string, array given, %s(%d) +NULL --int indexed array-- -Error: 8 - Array to string conversion, %s(%d) -string(7) "0.0.0.0" +Error: 2 - long2ip() expects parameter 1 to be string, array given, %s(%d) +NULL --associative array-- -Error: 8 - Array to string conversion, %s(%d) -string(7) "0.0.0.0" +Error: 2 - long2ip() expects parameter 1 to be string, array given, %s(%d) +NULL --nested arrays-- -Error: 8 - Array to string conversion, %s(%d) -string(7) "0.0.0.0" +Error: 2 - long2ip() expects parameter 1 to be string, array given, %s(%d) +NULL --uppercase NULL-- string(7) "0.0.0.0" @@ -181,9 +181,8 @@ string(7) "0.0.0.0" --instance of classWithoutToString-- -Error: 4096 - Object of class classWithoutToString could not be converted to string, %s(%d) -Error: 8 - Object of class classWithoutToString to string conversion, %s(%d) -string(7) "0.0.0.0" +Error: 2 - long2ip() expects parameter 1 to be string, object given, %s(%d) +NULL --undefined var-- string(7) "0.0.0.0" @@ -192,5 +191,6 @@ string(7) "0.0.0.0" --resource-- -string(7) "0.0.0.0" +Error: 2 - long2ip() expects parameter 1 to be string, resource given, %s(%d) +NULL ===DONE===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php