From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 19 Dec 2018 13:43:38 +0000 (+0300)
Subject: Replace add_index_zval() and add_next_index_zval() functions by macros
X-Git-Tag: php-7.4.0alpha1~1369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85e1df6fdcaf307c5e6b241df4d859e916806d2a;p=php

Replace add_index_zval() and add_next_index_zval() functions by macros
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 51e477b2ef..4e6f0f9de3 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1529,13 +1529,6 @@ ZEND_API int add_index_stringl(zval *arg, zend_ulong index, const char *str, siz
 }
 /* }}} */
 
-ZEND_API int add_index_zval(zval *arg, zend_ulong index, zval *value) /* {{{ */
-{
-	zend_hash_index_update(Z_ARRVAL_P(arg), index, value);
-	return SUCCESS;
-}
-/* }}} */
-
 ZEND_API int add_next_index_long(zval *arg, zend_long n) /* {{{ */
 {
 	zval tmp;
@@ -1608,12 +1601,6 @@ ZEND_API int add_next_index_stringl(zval *arg, const char *str, size_t length) /
 }
 /* }}} */
 
-ZEND_API int add_next_index_zval(zval *arg, zval *value) /* {{{ */
-{
-	return zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE;
-}
-/* }}} */
-
 ZEND_API zval *add_get_assoc_string_ex(zval *arg, const char *key, uint32_t key_len, const char *str) /* {{{ */
 {
 	zval tmp, *ret;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 989868a191..341d28c153 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -412,7 +412,9 @@ 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);
-ZEND_API int add_index_zval(zval *arg, zend_ulong index, zval *value);
+
+#define add_index_zval(arg, index, value) \
+	(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_null(zval *arg);
@@ -422,7 +424,9 @@ ZEND_API int add_next_index_double(zval *arg, double d);
 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);
-ZEND_API int add_next_index_zval(zval *arg, zval *value);
+
+#define add_next_index_zval(arg, value) \
+	(zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE)
 
 ZEND_API zval *add_get_assoc_string_ex(zval *arg, const char *key, uint32_t key_len, const char *str);
 ZEND_API zval *add_get_assoc_stringl_ex(zval *arg, const char *key, uint32_t key_len, const char *str, size_t length);