From: Andi Gutmans <andi@php.net>
Date: Tue, 1 Feb 2000 16:02:38 +0000 (+0000)
Subject: - Get rid of remains of garbage.
X-Git-Tag: BEFORE_SAPIFICATION_FEB_10_2000~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=131e3a06fba067cb65faa81a7cfb3c509c17d73d;p=php

- Get rid of remains of garbage.
- This should fix Thies' UMR
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3bbacfe2a7..d2505b83dd 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -757,6 +757,8 @@ void do_receive_arg(int op, znode *var, znode *offset, znode *initialization, un
 	opline->op1 = *offset;
 	if ((op == ZEND_RECV_INIT)) {
 		opline->op2 = *initialization;
+	} else {
+		SET_UNUSED(opline->op2);
 	}
 	if (pass_type==BYREF_FORCE && !CG(active_op_array)->arg_types) {
 		int i;
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a58cdf06cc..52f0e17f18 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -111,7 +111,6 @@ void init_executor(CLS_D ELS_DC)
 	zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_activator);
 	EG(opline_ptr) = NULL;
 	EG(garbage_ptr) = 0;
-	EG(suspend_garbage) = 0;
 
 	zend_hash_init(&EG(imported_files), 5, NULL, NULL, 0);
 
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 9592cb7790..4f7ba35c9d 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -176,7 +176,6 @@ struct _zend_executor_globals {
 
 	zval *garbage[4];
 	int garbage_ptr;
-	zend_bool suspend_garbage;
 
 	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 #if SUPPORT_INTERACTIVE