From: Andi Gutmans <andi@php.net>
Date: Mon, 12 Feb 2001 15:49:24 +0000 (+0000)
Subject: - Remove two unused functions
X-Git-Tag: php-4.0.5RC1~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4afacc0a7c9431ad3bcfcfda66bc2a3e5f81137e;p=php

- Remove two unused functions
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index df394a7df4..78b39f4515 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -743,47 +743,6 @@ ZEND_API int mod_function(zval *result, zval *op1, zval *op2)
 }
 
 
-ZEND_API int boolean_or_function(zval *result, zval *op1, zval *op2)
-{
-	zval op1_copy, op2_copy;
-	
-	result->type = IS_BOOL;
-
-	zendi_convert_to_boolean(op1, op1_copy, result);
-	if (op1->value.lval) {
-		result->value.lval = 1;
-		return SUCCESS;
-	}
-	zendi_convert_to_boolean(op2, op2_copy, result);
-	if (op2->value.lval) {
-		result->value.lval = 1;
-		return SUCCESS;
-	}
-	result->value.lval = 0;
-	return SUCCESS;
-}
-
-
-ZEND_API int boolean_and_function(zval *result, zval *op1, zval *op2)
-{
-	zval op1_copy, op2_copy;
-	
-	result->type = IS_BOOL;
-
-	zendi_convert_to_boolean(op1, op1_copy, result);
-	if (!op1->value.lval) {
-		result->value.lval = 0;
-		return SUCCESS;
-	}
-	zendi_convert_to_boolean(op2, op2_copy, result);
-	if (!op2->value.lval) {
-		result->value.lval = 0;
-		return SUCCESS;
-	}
-	result->value.lval = 1;
-	return SUCCESS;
-}
-
 
 ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2)
 {
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 75b1dd7fb3..de3e8e6011 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -41,9 +41,7 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2);
 ZEND_API int mul_function(zval *result, zval *op1, zval *op2);
 ZEND_API int div_function(zval *result, zval *op1, zval *op2);
 ZEND_API int mod_function(zval *result, zval *op1, zval *op2);
-ZEND_API int boolean_or_function(zval *result, zval *op1, zval *op2);
 ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2);
-ZEND_API int boolean_and_function(zval *result, zval *op1, zval *op2);
 ZEND_API int boolean_not_function(zval *result, zval *op1);
 ZEND_API int bitwise_not_function(zval *result, zval *op1);
 ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2);