From: Zeev Suraski <zeev@php.net>
Date: Thu, 6 Mar 2003 23:45:50 +0000 (+0000)
Subject: Fix warnings
X-Git-Tag: RELEASE_0_5~579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=805f98065d4f5f289e39a82c1538b18691308982;p=php

Fix warnings
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 1f89b7e0af..77bbd05ead 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2248,7 +2248,7 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
 }
 
 
-static do_verify_abstract_class(TSRMLS_D)
+static void do_verify_abstract_class(TSRMLS_D)
 {
 	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 598b0de2b7..0472d193fc 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2306,8 +2306,8 @@ int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS)
 	zend_class_entry **pce;
 	zend_class_entry *ce = NULL;
 	zend_bool is_const;
-	char *class_name_strval;
-	zend_uint class_name_strlen;						
+	char *class_name_strval = NULL;
+	zend_uint class_name_strlen = 0;
 	zval *class_name;					
 	zval tmp;
 	int retval;
@@ -2337,10 +2337,8 @@ int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS)
 	is_const = (EX(opline)->op2.op_type == IS_CONST);
 
 	if (is_const) {
-{
-			class_name_strval = EX(opline)->op2.u.constant.value.str.val;
-			class_name_strlen = EX(opline)->op2.u.constant.value.str.len;
-		}
+		class_name_strval = EX(opline)->op2.u.constant.value.str.val;
+		class_name_strlen = EX(opline)->op2.u.constant.value.str.len;
 	} else {
 		class_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R);
 
@@ -4019,8 +4017,6 @@ int zend_verify_instanceof_handler(ZEND_OPCODE_HANDLER_ARGS)
 int zend_verify_abstract_class(ZEND_OPCODE_HANDLER_ARGS)
 {
 	zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).EA.class_entry;
-	zend_bool declared_abstract = ce->ce_flags & ZEND_ACC_ABSTRACT_CLASS;
-	zend_bool detected_abstract = ce->ce_flags & ZEND_ACC_ABSTRACT;
 
 	if ((ce->ce_flags & ZEND_ACC_ABSTRACT)
 		&& !(ce->ce_flags & ZEND_ACC_ABSTRACT_CLASS)) {