From 6a8a5767c2ad20f7e23856ed1a8d8f7537562bcb Mon Sep 17 00:00:00 2001 From: Jeroen van Wolffelaar Date: Wed, 26 Sep 2001 08:53:37 +0000 Subject: [PATCH] 4rd run... now also var.Z_* --- ext/rpc/xmlrpc/xmlrpc-epi-php.c | 14 +++++++------- ext/xmlrpc/xmlrpc-epi-php.c | 14 +++++++------- scripts/conv_z_macros | 3 +++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c index 2a99e93dd1..d68e355def 100644 --- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c +++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c @@ -1039,21 +1039,21 @@ PHP_FUNCTION(xmlrpc_server_call_method) { XMLRPC_VALUE xAnswer = NULL; MAKE_STD_ZVAL(data.xmlrpc_method); /* init. very important. spent a frustrating day finding this out. */ MAKE_STD_ZVAL(data.return_data); - data.Z_TYPE_P(return_data) = IS_NULL; /* in case value is never init'd, we don't dtor to think it is a string or something */ - data.Z_TYPE_P(xmlrpc_method) = IS_NULL; + Z_TYPE_P(data.return_data) = IS_NULL; /* in case value is never init'd, we don't dtor to think it is a string or something */ + Z_TYPE_P(data.xmlrpc_method) = IS_NULL; /* setup some data to pass to the callback function */ - data.Z_STRVAL_P(xmlrpc_method) = estrdup(XMLRPC_RequestGetMethodName(xRequest)); - data.Z_STRLEN_P(xmlrpc_method) = strlen(data.Z_STRVAL_P(xmlrpc_method)); - data.Z_TYPE_P(xmlrpc_method) = IS_STRING; + Z_STRVAL_P(data.xmlrpc_method) = estrdup(XMLRPC_RequestGetMethodName(xRequest)); + Z_STRLEN_P(data.xmlrpc_method) = strlen(Z_STRVAL_P(data.xmlrpc_method)); + Z_TYPE_P(data.xmlrpc_method) = IS_STRING; data.caller_params = caller_params; data.php_executed = 0; data.server = server; /* check if the called method has been previous registered */ if(zend_hash_find(Z_ARRVAL_P(server->method_map), - data.Z_STRVAL_P(xmlrpc_method), - data.Z_STRLEN_P(xmlrpc_method) + 1, + Z_STRVAL_P(data.xmlrpc_method), + Z_STRLEN_P(data.xmlrpc_method) + 1, (void**)&php_function) == SUCCESS) { data.php_function = *php_function; diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 2a99e93dd1..d68e355def 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1039,21 +1039,21 @@ PHP_FUNCTION(xmlrpc_server_call_method) { XMLRPC_VALUE xAnswer = NULL; MAKE_STD_ZVAL(data.xmlrpc_method); /* init. very important. spent a frustrating day finding this out. */ MAKE_STD_ZVAL(data.return_data); - data.Z_TYPE_P(return_data) = IS_NULL; /* in case value is never init'd, we don't dtor to think it is a string or something */ - data.Z_TYPE_P(xmlrpc_method) = IS_NULL; + Z_TYPE_P(data.return_data) = IS_NULL; /* in case value is never init'd, we don't dtor to think it is a string or something */ + Z_TYPE_P(data.xmlrpc_method) = IS_NULL; /* setup some data to pass to the callback function */ - data.Z_STRVAL_P(xmlrpc_method) = estrdup(XMLRPC_RequestGetMethodName(xRequest)); - data.Z_STRLEN_P(xmlrpc_method) = strlen(data.Z_STRVAL_P(xmlrpc_method)); - data.Z_TYPE_P(xmlrpc_method) = IS_STRING; + Z_STRVAL_P(data.xmlrpc_method) = estrdup(XMLRPC_RequestGetMethodName(xRequest)); + Z_STRLEN_P(data.xmlrpc_method) = strlen(Z_STRVAL_P(data.xmlrpc_method)); + Z_TYPE_P(data.xmlrpc_method) = IS_STRING; data.caller_params = caller_params; data.php_executed = 0; data.server = server; /* check if the called method has been previous registered */ if(zend_hash_find(Z_ARRVAL_P(server->method_map), - data.Z_STRVAL_P(xmlrpc_method), - data.Z_STRLEN_P(xmlrpc_method) + 1, + Z_STRVAL_P(data.xmlrpc_method), + Z_STRLEN_P(data.xmlrpc_method) + 1, (void**)&php_function) == SUCCESS) { data.php_function = *php_function; diff --git a/scripts/conv_z_macros b/scripts/conv_z_macros index 72f07e2ca7..126ce875fb 100755 --- a/scripts/conv_z_macros +++ b/scripts/conv_z_macros @@ -51,6 +51,9 @@ for i in $@; do -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z_]\+\)(/Z_\2(\1->/g' \ -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z_]\+\)(/Z_\2(\1->/g' \ -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z_]\+\)(/Z_\2(\1->/g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)\.Z_\([A-Z_]\+\)(/Z_\2(\1./g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)\.Z_\([A-Z_]\+\)(/Z_\2(\1./g' \ + -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)\.Z_\([A-Z_]\+\)(/Z_\2(\1./g' \ < $i > tmp && cp tmp $i echo "DONE" done -- 2.40.0