4rd run... now also var.Z_*

diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
index 2a99e93dd1e26c31c7b305ef0a9f2ff21ad3b2bc..d68e355def553869ace266138b718ff0032f382c 100644 (file)
--- 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 2a99e93dd1e26c31c7b305ef0a9f2ff21ad3b2bc..d68e355def553869ace266138b718ff0032f382c 100644 (file)
--- 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 72f07e2ca7c756720365446c04e3c1673e1fffc1..126ce875fb0a2f80e9f38ffa746bc1dcf97476a5 100755 (executable)
--- 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