From 0e270661a44ad2ff833b9ca33663a841e79886b6 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 20 Oct 2014 13:55:55 +0400 Subject: Use ADDREF instead of DUP, it must be enough. --- Zend/zend_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 3e68a38487..41cba30109 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -221,7 +221,7 @@ ZEND_API void zval_add_ref_unref(zval *p) { if (Z_REFCOUNTED_P(p)) { if (Z_ISREF_P(p)) { - ZVAL_DUP(p, Z_REFVAL_P(p)); + ZVAL_COPY(p, Z_REFVAL_P(p)); } else { Z_ADDREF_P(p); } -- cgit v1.2.1 From 1b4fd5825a820873e4ed0f326bcb890e660dc39c Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 24 Oct 2014 20:57:38 +0200 Subject: fix datatype mismatch warnings --- Zend/zend_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 41cba30109..aae8465791 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -266,7 +266,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) } -ZEND_API int zend_print_variable(zval *var TSRMLS_DC) +ZEND_API size_t zend_print_variable(zval *var TSRMLS_DC) { return zend_print_zval(var, 0 TSRMLS_CC); } -- cgit v1.2.1