cvs: ZendEngine2 / zend_vm_def.h zend_vm_execute.h

tony2001 Wed Jul 12 21:14:11 2006 UTC Modified files: /ZendEngine2 zend_vm_def.h zend_vm_execute.h Log: get rid of more "might be uninitialized" warnings http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.124&r2=1.125&diff_format=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.124 ZendEngine2/zend_vm_def.h:1.125 --- ZendEngine2/zend_vm_def.h:1.124 Wed Jul 12 21:07:07 2006 +++ ZendEngine2/zend_vm_def.h Wed Jul 12 21:14:11 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.124 2006/07/12 21:07:07 tony2001 Exp $ */ +/* $Id: zend_vm_def.h,v 1.125 2006/07/12 21:14:11 tony2001 Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -1818,8 +1818,8 @@ { zend_op *opline = EX(opline); zval **original_return_value; - zend_class_entry *current_scope; - zval *current_this; + zend_class_entry *current_scope = NULL; + zval *current_this = NULL; int return_value_used = RETURN_VALUE_USED(opline); zend_bool should_change_scope; zend_op *ctor_opline; @@ -3245,7 +3245,7 @@ ulong int_key; HashTable *fe_ht; zend_object_iterator *iter = NULL; - int key_type; + int key_type = 0; zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY); PZVAL_LOCK(array); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.128&r2=1.129&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.128 ZendEngine2/zend_vm_execute.h:1.129 --- ZendEngine2/zend_vm_execute.h:1.128 Wed Jul 12 21:07:07 2006 +++ ZendEngine2/zend_vm_execute.h Wed Jul 12 21:14:11 2006 @@ -133,8 +133,8 @@ { zend_op *opline = EX(opline); zval **original_return_value; - zend_class_entry *current_scope; - zval *current_this; + zend_class_entry *current_scope = NULL; + zval *current_this = NULL; int return_value_used = RETURN_VALUE_USED(opline); zend_bool should_change_scope; zend_op *ctor_opline; @@ -7962,7 +7962,7 @@ ulong int_key; HashTable *fe_ht; zend_object_iterator *iter = NULL; - int key_type; + int key_type = 0; zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY); PZVAL_LOCK(array);