com php-src: Use better data structures (incomplete): Zend/zend_API.c Zend/zend_execute_API.c

Commit: 686a078258ec13b0e2d0a9ff581f07bef0ae2662 Author: Dmitry Stogov <dmitry@zend.com> Fri, 14 Feb 2014 14:55:48 +0400 Parents: a52817eb027f2f90973888f35578d7b9eaf51d10 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=686a078258ec13b0e2d0a9ff581f07bef0ae2662 Log: Use better data structures (incomplete) Changed paths: M Zend/zend_API.c M Zend/zend_execute_API.c Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 08d525d..356147d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1373,6 +1373,15 @@ ZEND_API int add_index_double(zval *arg, ulong index, double d) /* {{{ */ } /* }}} */ +ZEND_API int add_index_str(zval *arg, ulong index, zend_string *str) /* {{{ */ +{ + zval tmp; + + ZVAL_STR(&tmp, str); + return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; +} +/* }}} */ + ZEND_API int add_index_string(zval *arg, ulong index, const char *str, int duplicate) /* {{{ */ { zval tmp; diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 4894250..0e95e8f 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -42,8 +42,8 @@ ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data TSRMLS_DC); ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data_ptr, zend_fcall_info *fci, int return_value_used TSRMLS_DC); /* true globals */ -//???ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0 }; -//???ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL }; +ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, {{0},0}, NULL, NULL, 0, NULL, NULL, 0 }; +ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL }; #ifdef ZEND_WIN32 #include <process.h>