From f58d0b35edf25a8f39fad6bd5e0e4eeb5cdfe9a7 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 05:07:37 -0800 Subject: massive update semantical LONG vs INT replacements --- Zend/zend_variables.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 3fa1b063a1..fe9b017098 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -66,7 +66,7 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC) zend_list_delete(zvalue->value.lval); } break; - case IS_LONG: + case IS_INT: case IS_DOUBLE: case IS_BOOL: case IS_NULL: @@ -92,7 +92,7 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) case IS_RESOURCE: zend_error(E_CORE_ERROR, "Internal zval's can't be arrays, objects or resources"); break; - case IS_LONG: + case IS_INT: case IS_DOUBLE: case IS_BOOL: case IS_NULL: @@ -118,7 +118,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) } break; case IS_BOOL: - case IS_LONG: + case IS_INT: case IS_NULL: break; case IS_CONSTANT: -- cgit v1.2.1 From e11fbd979f8a06f2e5aecaa4b4fd8c31db53d4fa Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 22 Dec 2013 11:54:30 +0100 Subject: next wave of revamp in Zend --- 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 fe9b017098..6d72b5972f 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -157,7 +157,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) } -ZEND_API int zend_print_variable(zval *var) +ZEND_API zend_size_t zend_print_variable(zval *var) { return zend_print_zval(var, 0); } -- cgit v1.2.1 From 8ee2a4a9b5de682c0b37670e1f4f86242b1650ce Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 16 Aug 2014 11:16:11 +0200 Subject: first shot on merging the core fro the int64 branch --- Zend/zend_variables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 9f76d9f812..1c10a1451f 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -165,7 +165,7 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) free(ref); break; } - case IS_LONG: + case IS_INT: case IS_DOUBLE: case IS_FALSE: case IS_TRUE: @@ -196,7 +196,7 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) free(ref); break; } - case IS_LONG: + case IS_INT: case IS_DOUBLE: case IS_FALSE: case IS_TRUE: -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- Zend/zend_variables.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Zend/zend_variables.c') diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 1c10a1451f..1ec3ffb7ca 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -34,7 +34,7 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) case IS_CONSTANT: { zend_string *str = (zend_string*)p; CHECK_ZVAL_STRING_REL(str); - STR_RELEASE(str); + zend_string_release(str); break; } case IS_ARRAY: { @@ -94,7 +94,7 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) case IS_CONSTANT: { zend_string *str = (zend_string*)p; CHECK_ZVAL_STRING_REL(str); - STR_FREE(str); + zend_string_free(str); break; } case IS_ARRAY: { @@ -150,7 +150,7 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) case IS_STRING: case IS_CONSTANT: CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); - STR_RELEASE(Z_STR_P(zvalue)); + zend_string_release(Z_STR_P(zvalue)); break; case IS_ARRAY: case IS_CONSTANT_AST: @@ -165,7 +165,7 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) free(ref); break; } - case IS_INT: + case IS_LONG: case IS_DOUBLE: case IS_FALSE: case IS_TRUE: @@ -181,7 +181,7 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) case IS_STRING: case IS_CONSTANT: CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); - STR_FREE(Z_STR_P(zvalue)); + zend_string_free(Z_STR_P(zvalue)); break; case IS_ARRAY: case IS_CONSTANT_AST: @@ -196,7 +196,7 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) free(ref); break; } - case IS_INT: + case IS_LONG: case IS_DOUBLE: case IS_FALSE: case IS_TRUE: @@ -234,7 +234,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) case IS_CONSTANT: case IS_STRING: CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); - Z_STR_P(zvalue) = STR_DUP(Z_STR_P(zvalue), 0); + Z_STR_P(zvalue) = zend_string_dup(Z_STR_P(zvalue), 0); break; case IS_ARRAY: { HashTable *ht; -- cgit v1.2.1