summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-07-12 21:17:30 +0000
committerAntony Dovgal <tony2001@php.net>2006-07-12 21:17:30 +0000
commita9469060e57c1cf044ee020e35bb45d6929b5895 (patch)
tree1d3b8fbeb2e1bd6c63410dd8eedb8b41c3f3a77d /Zend
parent9d576212356b0d0d1df1ffff2b4ee9e800b6bba0 (diff)
downloadphp-git-a9469060e57c1cf044ee020e35bb45d6929b5895.tar.gz
MFH: init variables and get rid of annoying warnings
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_vm_def.h6
-rw-r--r--Zend/zend_vm_execute.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index cbf2f1fb61..0eaf0332c1 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1793,8 +1793,8 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
{
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;
@@ -3158,7 +3158,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
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);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f752cd7efd..9133269f39 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -126,8 +126,8 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
{
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;
@@ -7832,7 +7832,7 @@ static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
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);