From: Marcus Boerger Date: Tue, 9 May 2006 21:26:39 +0000 (+0000) Subject: - MFB: WS X-Git-Tag: BEFORE_NEW_OUTPUT_API~259 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0638c67dabb48b2b6396bf9a44c773c43c002804;p=php - MFB: WS --- diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 89c49a1179..ff30d9fccc 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -668,7 +668,6 @@ ZEND_API ZEND_FUNCTION(display_disabled_function); ZEND_API ZEND_FUNCTION(display_disabled_class); END_EXTERN_C() - #if ZEND_DEBUG #define CHECK_ZVAL_STRING(z) \ if (Z_STRVAL_P(z)[Z_STRLEN_P(z)] != '\0') { zend_error(E_WARNING, "String is not zero-terminated (%s)", Z_STRVAL_P(z)); } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 0173573b23..f3d9b6a76b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -511,7 +511,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva zend_class_entry *ce = zend_u_fetch_class(UG(unicode) ? IS_UNICODE : IS_STRING, cur_arg_info->class_name, cur_arg_info->class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); if (!instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) { char *error_msg; - if (ce->ce_flags & ZEND_ACC_INTERFACE) { + if (ce->ce_flags & ZEND_ACC_INTERFACE) { error_msg = "implement interface"; } else { error_msg = "be an instance of"; diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c index a831456f5c..74d55e1849 100755 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c @@ -87,7 +87,6 @@ ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap( } return ZEND_ITER_INVALID; - case IS_ARRAY: if (HASH_OF(array_ptr)) { return ZEND_ITER_PLAIN_ARRAY; diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 803be752e3..2e0c3739fb 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -957,7 +957,7 @@ static int zend_std_has_property(zval *object, zval *member, int has_set_exists zobj = Z_OBJ_P(object); if (Z_TYPE_P(member) != IS_UNICODE && (UG(unicode) || Z_TYPE_P(member) != IS_STRING)) { - ALLOC_ZVAL(tmp_member); + ALLOC_ZVAL(tmp_member); *tmp_member = *member; INIT_PZVAL(tmp_member); zval_copy_ctor(tmp_member);