diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/xmlrpc | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/xmlrpc')
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 4c1b6ef785..62bc39dba4 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -406,7 +406,7 @@ static void set_output_options(php_output_options* options, zval* output_opts) options->xmlrpc_out.version = xmlrpc_version_simple; } else if (!strcmp(Z_STRVAL_P(val), VERSION_VALUE_SOAP11)) { options->xmlrpc_out.version = xmlrpc_version_soap_1_1; - } else { /* if(!strcmp((*val)->value.str.val, VERSION_VALUE_AUTO)) { */ + } else { /* if(!strcmp(Z_STRVAL_P(val), VERSION_VALUE_AUTO)) { */ options->b_auto_version = 1; } } @@ -575,7 +575,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep efree(num_str); } } else { - XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(my_key->val, pIter, depth++)); + XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(ZSTR_VAL(my_key), pIter, depth++)); } if (ht) { ht->u.v.nApplyCount--; @@ -921,25 +921,25 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) if (xData) { if (!XMLRPC_ServerAddIntrospectionData(server, xData)) { - php_error_docref(NULL, E_WARNING, "Unable to add introspection data returned from %s(), improper element structure", php_function_name->val); + php_error_docref(NULL, E_WARNING, "Unable to add introspection data returned from %s(), improper element structure", ZSTR_VAL(php_function_name)); } XMLRPC_CleanupValue(xData); } else { /* could not create description */ if (err.xml_elem_error.parser_code) { php_error_docref(NULL, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", - err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, php_function_name->val); + err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, ZSTR_VAL(php_function_name)); } else { - php_error_docref(NULL, E_WARNING, "Unable to add introspection data returned from %s()", php_function_name->val); + php_error_docref(NULL, E_WARNING, "Unable to add introspection data returned from %s()", ZSTR_VAL(php_function_name)); } } zval_ptr_dtor(&retval); } else { /* user func failed */ - php_error_docref(NULL, E_WARNING, "Error calling user introspection callback: %s()", php_function_name->val); + php_error_docref(NULL, E_WARNING, "Error calling user introspection callback: %s()", ZSTR_VAL(php_function_name)); } } else { - php_error_docref(NULL, E_WARNING, "Invalid callback '%s' passed", php_function_name->val); + php_error_docref(NULL, E_WARNING, "Invalid callback '%s' passed", ZSTR_VAL(php_function_name)); } zend_string_release(php_function_name); } ZEND_HASH_FOREACH_END(); |