Skip to content

Turn add_index_zval and add_next_index_zval into inline function #4250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Turn add_index_zval and add_next_index_zval into inline function #4250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75cb61c
Turn add_index_zval and add_next_index_zval into inline function
twose Jun 11, 2019
6c33445
Remove the return value of add_index_zval
twose Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,17 +405,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_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_null(zval *arg, zend_ulong idx);
ZEND_API int add_index_bool(zval *arg, zend_ulong idx, int b);
ZEND_API int add_index_resource(zval *arg, zend_ulong idx, zend_resource *r);
ZEND_API int add_index_double(zval *arg, zend_ulong idx, double d);
ZEND_API int add_index_str(zval *arg, zend_ulong idx, zend_string *str);
ZEND_API int add_index_string(zval *arg, zend_ulong idx, const char *str);
ZEND_API int add_index_stringl(zval *arg, zend_ulong idx, const char *str, size_t length);

#define add_index_zval(arg, index, value) \
(zend_hash_index_update(Z_ARRVAL_P(arg), index, value) ? SUCCESS : FAILURE)
ZEND_API int add_index_long(zval *arg, zend_ulong index, zend_long n);
ZEND_API int add_index_null(zval *arg, zend_ulong index);
ZEND_API int add_index_bool(zval *arg, zend_ulong index, int b);
ZEND_API int add_index_resource(zval *arg, zend_ulong index, zend_resource *r);
ZEND_API int add_index_double(zval *arg, zend_ulong index, double d);
ZEND_API int add_index_str(zval *arg, zend_ulong index, zend_string *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 index, const char *str, size_t length);

static zend_always_inline void add_index_zval(zval *arg, zend_ulong index, zval *value)
{
zend_hash_index_update(Z_ARRVAL_P(arg), index, value);
}

ZEND_API int add_next_index_long(zval *arg, zend_long n);
ZEND_API int add_next_index_null(zval *arg);
Expand All @@ -426,8 +428,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_stringl(zval *arg, const char *str, size_t length);

#define add_next_index_zval(arg, value) \
(zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE)
static zend_always_inline int add_next_index_zval(zval *arg, zval *value)
{
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);

Expand Down