diff options
| author | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-26 08:35:48 +0000 |
|---|---|---|
| committer | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-26 08:35:48 +0000 |
| commit | 21f2b9277ff3a878ca57559b96e692f3551320b8 (patch) | |
| tree | 2531c27273ebcf5c475ebc92979134ed89929185 /ext/rpc | |
| parent | b0468809ff52a10653718cc47e8a760b8ac1b0ad (diff) | |
| download | php-git-21f2b9277ff3a878ca57559b96e692f3551320b8.tar.gz | |
3rd run in back-substitutin Z_* macro's. The val->Z_ cases are all solved now.
Diffstat (limited to 'ext/rpc')
| -rw-r--r-- | ext/rpc/java/java.c | 6 | ||||
| -rw-r--r-- | ext/rpc/xmlrpc/xmlrpc-epi-php.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index af8c7fd3fb..a1c9458670 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -422,7 +422,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe if (!JG(jenv)) return; jenv = JG(jenv); - if (!strcmp("java", function_name->Z_STRVAL(element))) { + if (!strcmp("java", Z_STRVAL(function_name->element))) { /* construct a Java object: First argument is the class name. Any additional arguments will @@ -457,7 +457,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;J)V"); zend_hash_index_find(Z_OBJPROP_P(object), 0, (void**) &handle); obj = zend_list_find(Z_LVAL_PP(handle), &type); - method = (*jenv)->NewStringUTF(jenv, function_name->Z_STRVAL(element)); + method = (*jenv)->NewStringUTF(jenv, Z_STRVAL(function_name->element)); result = (jlong)(long)return_value; (*jenv)->CallVoidMethod(jenv, JG(php_reflect), invoke, @@ -526,7 +526,7 @@ static pval _java_getset_property JNIEnv *jenv; jenv = JG(jenv); - propName = (*jenv)->NewStringUTF(jenv, property->Z_STRVAL(element)); + propName = (*jenv)->NewStringUTF(jenv, Z_STRVAL(property->element)); /* get the object */ zend_hash_index_find(Z_OBJPROP_P(property_reference->object), diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c index 421e80b29a..2a99e93dd1 100644 --- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c +++ b/ext/rpc/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) { |