felipe Thu Jul 24 12:48:47 2008 UTC
Modified files:
/php-src/ext/standard dir.c
/php-src/ext/standard/tests/dir closedir_error.phpt
closedir_variation1.phpt
readdir_error.phpt
readdir_variation1.phpt
rewinddir_error.phpt
rewinddir_variation1.phpt
Log:
- New parameter parsing API
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.177&r2=1.178&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.177 php-src/ext/standard/dir.c:1.178
--- php-src/ext/standard/dir.c:1.177 Wed Jul 23 11:24:34 2008
+++ php-src/ext/standard/dir.c Thu Jul 24 12:48:47 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.177 2008/07/23 11:24:34 tony2001 Exp $ */
+/* $Id: dir.c,v 1.178 2008/07/24 12:48:47 felipe Exp $ */
/* {{{ includes/startup/misc */
@@ -74,6 +74,9 @@
static zend_class_entry *dir_class_entry_ptr;
#define FETCH_DIRP() \
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &id) ==
FAILURE) { \
+ return; \
+ } \
if (ZEND_NUM_ARGS() == 0) { \
myself = getThis(); \
if (myself) { \
@@ -85,10 +88,8 @@
} else { \
ZEND_FETCH_RESOURCE(dirp, php_stream *, 0,
DIRG(default_dir), "Directory", php_file_le_stream()); \
} \
- } else if ((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &id) ==
FAILURE) { \
- WRONG_PARAM_COUNT; \
} else { \
- dirp = (php_stream *) zend_fetch_resource(id TSRMLS_CC, -1,
"Directory", NULL, 1, php_file_le_stream()); \
+ dirp = (php_stream *) zend_fetch_resource(&id TSRMLS_CC, -1,
"Directory", NULL, 1, php_file_le_stream()); \
if (!dirp) \
RETURN_FALSE; \
}
@@ -278,7 +279,7 @@
Close directory connection identified by the dir_handle */
PHP_FUNCTION(closedir)
{
- zval **id, **tmp, *myself;
+ zval *id = NULL, **tmp, *myself;
php_stream *dirp;
int rsrc_id;
@@ -386,7 +387,7 @@
Rewind dir_handle back to the start */
PHP_FUNCTION(rewinddir)
{
- zval **id, **tmp, *myself;
+ zval *id = NULL, **tmp, *myself;
php_stream *dirp;
FETCH_DIRP();
@@ -404,7 +405,7 @@
Read directory entry from dir_handle */
PHP_NAMED_FUNCTION(php_if_readdir)
{
- zval **id, **tmp, *myself;
+ zval *id = NULL, **tmp, *myself;
php_stream *dirp;
php_stream_dirent entry;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/dir/closedir_error.phpt
diff -u php-src/ext/standard/tests/dir/closedir_error.phpt:1.3
php-src/ext/standard/tests/dir/closedir_error.phpt:1.4
--- php-src/ext/standard/tests/dir/closedir_error.phpt:1.3 Mon May 26
23:48:29 2008
+++ php-src/ext/standard/tests/dir/closedir_error.phpt Thu Jul 24 12:48:47 2008
@@ -40,6 +40,6 @@
-- Testing closedir() function with more than expected no. of arguments --
-Warning: Wrong parameter count for closedir() in %s on line %d
+Warning: closedir() expects at most 1 parameter, 2 given in %s on line %d
NULL
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/dir/closedir_variation1.phpt
diff -u php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.3
php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.4
--- php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.3 Mon May 26
23:48:29 2008
+++ php-src/ext/standard/tests/dir/closedir_variation1.phpt Thu Jul 24
12:48:47 2008
@@ -92,121 +92,121 @@
-- Iteration 1 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 2 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 3 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 4 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 5 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 6 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 7 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 8 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 9 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 10 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 11 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 12 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 13 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 14 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 15 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 16 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 17 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 18 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, array given in %s on
line %d
+NULL
-- Iteration 19 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 20 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 21 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 22 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, object given in %s on
line %d
+NULL
-- Iteration 23 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 24 --
-Warning: closedir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: closedir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/dir/readdir_error.phpt
diff -u php-src/ext/standard/tests/dir/readdir_error.phpt:1.3
php-src/ext/standard/tests/dir/readdir_error.phpt:1.4
--- php-src/ext/standard/tests/dir/readdir_error.phpt:1.3 Mon May 26
23:48:29 2008
+++ php-src/ext/standard/tests/dir/readdir_error.phpt Thu Jul 24 12:48:47 2008
@@ -38,6 +38,6 @@
-- Testing readdir() function with more than expected no. of arguments --
-Warning: Wrong parameter count for readdir() in %s on line %d
+Warning: readdir() expects at most 1 parameter, 2 given in %s on line %d
NULL
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/dir/readdir_variation1.phpt
diff -u php-src/ext/standard/tests/dir/readdir_variation1.phpt:1.3
php-src/ext/standard/tests/dir/readdir_variation1.phpt:1.4
--- php-src/ext/standard/tests/dir/readdir_variation1.phpt:1.3 Mon May 26
23:48:29 2008
+++ php-src/ext/standard/tests/dir/readdir_variation1.phpt Thu Jul 24
12:48:47 2008
@@ -90,121 +90,121 @@
-- Iteration 1 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 2 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 3 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 4 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, integer given in %s on
line %d
+NULL
-- Iteration 5 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 6 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 7 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 8 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 9 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 10 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 11 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 12 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 13 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 14 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 15 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, boolean given in %s on
line %d
+NULL
-- Iteration 16 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, Unicode string given in
%s on line %d
+NULL
-- Iteration 17 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, Unicode string given in
%s on line %d
+NULL
-- Iteration 18 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, array given in %s on
line %d
+NULL
-- Iteration 19 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, Unicode string given in
%s on line %d
+NULL
-- Iteration 20 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, Unicode string given in
%s on line %d
+NULL
-- Iteration 21 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, Unicode string given in
%s on line %d
+NULL
-- Iteration 22 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, object given in %s on
line %d
+NULL
-- Iteration 23 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 24 --
-Warning: readdir(): supplied argument is not a valid Directory resource in %s
on line %d
-bool(false)
+Warning: readdir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/dir/rewinddir_error.phpt
diff -u php-src/ext/standard/tests/dir/rewinddir_error.phpt:1.3
php-src/ext/standard/tests/dir/rewinddir_error.phpt:1.4
--- php-src/ext/standard/tests/dir/rewinddir_error.phpt:1.3 Mon May 26
23:48:29 2008
+++ php-src/ext/standard/tests/dir/rewinddir_error.phpt Thu Jul 24 12:48:47 2008
@@ -37,6 +37,6 @@
-- Testing rewinddir() function with more than expected no. of arguments --
-Warning: Wrong parameter count for rewinddir() in %s on line %d
+Warning: rewinddir() expects at most 1 parameter, 2 given in %s on line %d
NULL
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/dir/rewinddir_variation1.phpt
diff -u php-src/ext/standard/tests/dir/rewinddir_variation1.phpt:1.3
php-src/ext/standard/tests/dir/rewinddir_variation1.phpt:1.4
--- php-src/ext/standard/tests/dir/rewinddir_variation1.phpt:1.3 Mon May
26 23:48:29 2008
+++ php-src/ext/standard/tests/dir/rewinddir_variation1.phpt Thu Jul 24
12:48:47 2008
@@ -26,7 +26,7 @@
}
}
-// heredoc string
+// heredoc Unicode string
$heredoc = <<<EOT
hello world
EOT;
@@ -62,9 +62,9 @@
'',
array(),
- // string data
-/*19*/ "string",
- 'string',
+ // Unicode string data
+/*19*/ "Unicode string",
+ 'Unicode string',
$heredoc,
// object data
@@ -91,121 +91,121 @@
-- Iteration 1 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, integer given in %s
on line %d
+NULL
-- Iteration 2 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, integer given in %s
on line %d
+NULL
-- Iteration 3 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, integer given in %s
on line %d
+NULL
-- Iteration 4 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, integer given in %s
on line %d
+NULL
-- Iteration 5 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 6 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 7 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 8 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 9 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, double given in %s on
line %d
+NULL
-- Iteration 10 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 11 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 12 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s
on line %d
+NULL
-- Iteration 13 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s
on line %d
+NULL
-- Iteration 14 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s
on line %d
+NULL
-- Iteration 15 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s
on line %d
+NULL
-- Iteration 16 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 17 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 18 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, array given in %s on
line %d
+NULL
-- Iteration 19 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 20 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 21 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, Unicode string given
in %s on line %d
+NULL
-- Iteration 22 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, object given in %s on
line %d
+NULL
-- Iteration 23 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
-- Iteration 24 --
-Warning: rewinddir(): supplied argument is not a valid Directory resource in
%s on line %d
-bool(false)
+Warning: rewinddir() expects parameter 1 to be resource, null given in %s on
line %d
+NULL
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
