From 21f2b9277ff3a878ca57559b96e692f3551320b8 Mon Sep 17 00:00:00 2001 From: Jeroen van Wolffelaar Date: Wed, 26 Sep 2001 08:35:48 +0000 Subject: 3rd run in back-substitutin Z_* macro's. The val->Z_ cases are all solved now. --- ext/xmlrpc/xmlrpc-epi-php.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/xmlrpc/xmlrpc-epi-php.c') diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 421e80b29a..2a99e93dd1 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -872,9 +872,9 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) callback_params[0] = pData->caller_params; /* loop through and call all registered callbacks */ - zend_hash_internal_pointer_reset(pData->server->Z_ARRVAL_P(introspection_map)); + zend_hash_internal_pointer_reset(Z_ARRVAL_P(pData->server->introspection_map)); while(1) { - if(zend_hash_get_current_data(pData->server->Z_ARRVAL_P(introspection_map), + if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), (void**)&php_function) == SUCCESS) { /* php func prototype: function string user_func($user_params) */ @@ -915,11 +915,11 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) break; } - zend_hash_move_forward(pData->server->Z_ARRVAL_P(introspection_map)); + zend_hash_move_forward(Z_ARRVAL_P(pData->server->introspection_map)); } /* so we don't call the same callbacks ever again */ - zend_hash_clean(pData->server->Z_ARRVAL_P(introspection_map)); + zend_hash_clean(Z_ARRVAL_P(pData->server->introspection_map)); } /* {{{ proto boolean xmlrpc_server_register_method(handle server, string method_name, string function) @@ -1051,7 +1051,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) { data.server = server; /* check if the called method has been previous registered */ - if(zend_hash_find(server->Z_ARRVAL_P(method_map), + if(zend_hash_find(Z_ARRVAL_P(server->method_map), data.Z_STRVAL_P(xmlrpc_method), data.Z_STRLEN_P(xmlrpc_method) + 1, (void**)&php_function) == SUCCESS) { -- cgit v1.2.1