helly Sun Feb 12 16:44:37 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c spl_array.c
Log:
- MFH No more old parameter api usage
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.25&r2=1.52.2.26&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.25 php-src/ext/spl/php_spl.c:1.52.2.26
--- php-src/ext/spl/php_spl.c:1.52.2.25 Sun Jan 1 12:50:13 2006
+++ php-src/ext/spl/php_spl.c Sun Feb 12 16:44:36 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.25 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: php_spl.c,v 1.52.2.26 2006/02/12 16:44:36 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -340,7 +340,7 @@
Try all registerd autoload function to load the requested class */
PHP_FUNCTION(spl_autoload_call)
{
- zval **class_name, *retval = NULL;
+ zval *class_name, *retval = NULL;
int class_name_len;
char *func_name, *lc_name;
uint func_name_len;
@@ -348,18 +348,18 @@
HashPosition function_pos;
autoload_func_info *alfi;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name) ==
FAILURE || Z_TYPE_PP(class_name) != IS_STRING) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &class_name)
== FAILURE || Z_TYPE_P(class_name) != IS_STRING) {
return;
}
if (SPL_G(autoload_functions)) {
- class_name_len = Z_STRLEN_PP(class_name);
- lc_name = zend_str_tolower_dup(Z_STRVAL_PP(class_name),
class_name_len);
+ class_name_len = Z_STRLEN_P(class_name);
+ lc_name = zend_str_tolower_dup(Z_STRVAL_P(class_name),
class_name_len);
zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions),
&function_pos);
while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions),
&function_pos) == SUCCESS && !EG(exception)) {
zend_hash_get_current_key_ex(SPL_G(autoload_functions),
&func_name, &func_name_len, &dummy, 0, &function_pos);
zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &alfi,
&function_pos);
- zend_call_method(alfi->obj ? &alfi->obj : NULL,
alfi->ce, &alfi->func_ptr, func_name, func_name_len, &retval, 1, *class_name,
NULL TSRMLS_CC);
+ zend_call_method(alfi->obj ? &alfi->obj : NULL,
alfi->ce, &alfi->func_ptr, func_name, func_name_len, &retval, 1, class_name,
NULL TSRMLS_CC);
if (retval) {
zval_ptr_dtor(&retval);
}
@@ -371,7 +371,7 @@
efree(lc_name);
} else {
/* do not use or overwrite &EG(autoload_func) here */
- zend_call_method_with_1_params(NULL, NULL, NULL,
"spl_autoload", NULL, *class_name);
+ zend_call_method_with_1_params(NULL, NULL, NULL,
"spl_autoload", NULL, class_name);
}
} /* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.8&r2=1.71.2.9&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.8
php-src/ext/spl/spl_array.c:1.71.2.9
--- php-src/ext/spl/spl_array.c:1.71.2.8 Thu Feb 2 22:17:42 2006
+++ php-src/ext/spl/spl_array.c Sun Feb 12 16:44:36 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.8 2006/02/02 22:17:42 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.9 2006/02/12 16:44:36 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -913,11 +913,10 @@
array_init(return_value);
zend_hash_copy(HASH_OF(return_value), spl_array_get_hash_table(intern,
0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref, &tmp, sizeof(zval*));
- if (ZEND_NUM_ARGS() > 1 || zend_get_parameters_ex(1, &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &array) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- if (Z_TYPE_PP(array) == IS_OBJECT && intern ==
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC))
- {
+ if (Z_TYPE_PP(array) == IS_OBJECT && intern ==
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC)) {
zval_ptr_dtor(&intern->array);
array = &object;
intern->array = object;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
