cvs: php4 /ext/xmlrpc xmlrpc-epi-php.c /scripts conv_z_macros

jeroen Wed Sep 26 04:53:36 2001 EDT Modified files: /php4/ext/xmlrpc xmlrpc-epi-php.c /php4/scripts conv_z_macros Log: 4rd run... now also var.Z_* Index: php4/ext/xmlrpc/xmlrpc-epi-php.c diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.4 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.5 --- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.4 Wed Sep 26 04:35:45 2001 +++ php4/ext/xmlrpc/xmlrpc-epi-php.c Wed Sep 26 04:53:36 2001 @@ -1039,21 +1039,21 @@ 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; Index: php4/scripts/conv_z_macros diff -u php4/scripts/conv_z_macros:1.8 php4/scripts/conv_z_macros:1.9 --- php4/scripts/conv_z_macros:1.8 Wed Sep 26 04:32:55 2001 +++ php4/scripts/conv_z_macros Wed Sep 26 04:53:36 2001 @@ -16,7 +16,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+# # -# $Id: conv_z_macros,v 1.8 2001/09/26 08:32:55 jeroen Exp $ +# $Id: conv_z_macros,v 1.9 2001/09/26 08:53:36 jeroen Exp $ for i in $@; do echo -n "Processing $i... " @@ -51,6 +51,9 @@ -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