zeev Thu Nov 25 15:28:38 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/com_dotnet com_handlers.c
/php-src/ext/spl spl_iterators.c
/php-src/ext/standard incomplete_class.c
Log:
Reverting get_method() signature change
@ Guys - I did my best to look for all of the changed places,
@ but I may have missed something. If you remember other places
@ which were changed that I haven't reverted, please fix or let me know.
@ Also - Marcus, please take a look at SPL - as this particular
@ implementation took advantage of the signature change, the way I 'fixed'
@ it may very well be incorrect
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.22.2.2&r2=1.22.2.3&ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.22.2.2
php-src/ext/com_dotnet/com_handlers.c:1.22.2.3
--- php-src/ext/com_dotnet/com_handlers.c:1.22.2.2 Sat Nov 20 06:41:24 2004
+++ php-src/ext/com_dotnet/com_handlers.c Thu Nov 25 15:28:37 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.22.2.2 2004/11/20 11:41:24 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.22.2.3 2004/11/25 20:28:37 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -293,13 +293,12 @@
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
-static union _zend_function *com_method_get(zval **object_ptr, char *name, int
len TSRMLS_DC)
+static union _zend_function *com_method_get(zval *object, char *name, int len
TSRMLS_DC)
{
zend_internal_function f, *fptr = NULL;
php_com_dotnet_object *obj;
union _zend_function *func;
DISPID dummy;
- zval *object = *object_ptr;
obj = CDNO_FETCH(object);
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.4&r2=1.38.2.5&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.38.2.4
php-src/ext/spl/spl_iterators.c:1.38.2.5
--- php-src/ext/spl/spl_iterators.c:1.38.2.4 Sun Oct 31 10:43:06 2004
+++ php-src/ext/spl/spl_iterators.c Thu Nov 25 15:28:37 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.38.2.4 2004/10/31 15:43:06 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.38.2.5 2004/11/25 20:28:37 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -489,19 +489,19 @@
}
#endif
-static union _zend_function *spl_dual_it_get_method(zval **object_ptr, char
*method, int method_len TSRMLS_DC)
+static union _zend_function *spl_dual_it_get_method(zval *object_ptr, char
*method, int method_len TSRMLS_DC)
{
union _zend_function *function_handler;
spl_dual_it_object *intern;
- intern = (spl_dual_it_object*)zend_object_store_get_object(*object_ptr
TSRMLS_CC);
+ intern = (spl_dual_it_object*)zend_object_store_get_object(object_ptr
TSRMLS_CC);
function_handler = std_object_handlers.get_method(object_ptr, method,
method_len TSRMLS_CC);
if (!function_handler) {
if (zend_hash_find(&intern->inner.ce->function_table, method,
method_len+1, (void **) &function_handler) == FAILURE) {
if (Z_OBJ_HT_P(intern->inner.zobject)->get_method) {
- *object_ptr = intern->inner.zobject;
- function_handler =
Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len TSRMLS_CC);
+ object_ptr = intern->inner.zobject;
+ function_handler =
Z_OBJ_HT_P(object_ptr)->get_method(object_ptr, method, method_len TSRMLS_CC);
}
}
}
http://cvs.php.net/diff.php/php-src/ext/standard/incomplete_class.c?r1=1.24.2.2&r2=1.24.2.3&ty=u
Index: php-src/ext/standard/incomplete_class.c
diff -u php-src/ext/standard/incomplete_class.c:1.24.2.2
php-src/ext/standard/incomplete_class.c:1.24.2.3
--- php-src/ext/standard/incomplete_class.c:1.24.2.2 Sat Oct 30 15:17:21 2004
+++ php-src/ext/standard/incomplete_class.c Thu Nov 25 15:28:37 2004
@@ -17,7 +17,7 @@
*/
-/* $Id: incomplete_class.c,v 1.24.2.2 2004/10/30 19:17:21 helly Exp $ */
+/* $Id: incomplete_class.c,v 1.24.2.3 2004/11/25 20:28:37 zeev Exp $ */
#include "php.h"
#include "basic_functions.h"
@@ -82,8 +82,8 @@
return 0;
}
-static union _zend_function *incomplete_class_get_method(zval **object_ptr,
char *method, int method_len TSRMLS_DC) {
- incomplete_class_message(*object_ptr, E_ERROR TSRMLS_CC);
+static union _zend_function *incomplete_class_get_method(zval *object_ptr,
char *method, int method_len TSRMLS_DC) {
+ incomplete_class_message(object_ptr, E_ERROR TSRMLS_CC);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
