archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Turn add_index_zval and add_next_index_zval into inline function

Browse source 
Avoids expression warnings and allows explicitly namespaced use in
C++.

Closes GH-4250.
This commit is contained in:
twosee 2019-06-11 22:07:32 +08:00 • committed by Nikita Popov
parent dd10bf5450
commit 42cc58ff7b
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Zend/zend_API.h
View file

@ -408,17 +408,19 @@ ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, size_t key_len, zval
#define add_assoc_stringl(__arg, __key, __str, __length) add_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length) #define add_assoc_stringl(__arg, __key, __str, __length) add_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length)
#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key), __value) #define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key), __value)
ZEND_API int add_index_long(zval *arg, zend_ulong idx, zend_long n); ZEND_API int add_index_long(zval *arg, zend_ulong index, zend_long n);
ZEND_API int add_index_null(zval *arg, zend_ulong idx); ZEND_API int add_index_null(zval *arg, zend_ulong index);
ZEND_API int add_index_bool(zval *arg, zend_ulong idx, int b); ZEND_API int add_index_bool(zval *arg, zend_ulong index, int b);
ZEND_API int add_index_resource(zval *arg, zend_ulong idx, zend_resource *r); ZEND_API int add_index_resource(zval *arg, zend_ulong index, zend_resource *r);
ZEND_API int add_index_double(zval *arg, zend_ulong idx, double d); ZEND_API int add_index_double(zval *arg, zend_ulong index, double d);
ZEND_API int add_index_str(zval *arg, zend_ulong idx, zend_string *str); ZEND_API int add_index_str(zval *arg, zend_ulong index, zend_string *str);
ZEND_API int add_index_string(zval *arg, zend_ulong idx, const char *str); ZEND_API int add_index_string(zval *arg, zend_ulong index, const char *str);
ZEND_API int add_index_stringl(zval *arg, zend_ulong idx, const char *str, size_t length); ZEND_API int add_index_stringl(zval *arg, zend_ulong index, const char *str, size_t length);
#define add_index_zval(arg, index, value) \ static zend_always_inline int add_index_zval(zval *arg, zend_ulong index, zval *value)
(zend_hash_index_update(Z_ARRVAL_P(arg), index, value) ? SUCCESS : FAILURE) {
return zend_hash_index_update(Z_ARRVAL_P(arg), index, value) ? SUCCESS : FAILURE;
}
ZEND_API int add_next_index_long(zval *arg, zend_long n); ZEND_API int add_next_index_long(zval *arg, zend_long n);
ZEND_API int add_next_index_null(zval *arg); ZEND_API int add_next_index_null(zval *arg);
@ -429,8 +431,10 @@ ZEND_API int add_next_index_str(zval *arg, zend_string *str);
ZEND_API int add_next_index_string(zval *arg, const char *str); ZEND_API int add_next_index_string(zval *arg, const char *str);
ZEND_API int add_next_index_stringl(zval *arg, const char *str, size_t length); ZEND_API int add_next_index_stringl(zval *arg, const char *str, size_t length);
#define add_next_index_zval(arg, value) \ static zend_always_inline int add_next_index_zval(zval *arg, zval *value)
(zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE) {
return zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE;
}
ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value); ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value);