ZVAL_BOOL(v,0) -> ZVAL_FALSE(v)

4 files changed, 9 insertions, 9 deletions

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 7304f68676..0e8401285e 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -1321,7 +1321,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 		if(!zend_is_true(return_value))
 		{
-			ZVAL_BOOL(object, 0);
+			ZVAL_FALSE(object);
 			return;
 		}
 		ALLOC_ZVAL(object_handle);
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 1b523a59b5..3722c31bfd 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -127,7 +127,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
 				if(NULL == safeArray)
 				{
 					php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
-					ZVAL_BOOL(pval_arg, 0);
+					ZVAL_FALSE(pval_arg);
 				}
 				else
 				{
@@ -473,7 +473,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 		if (1 != (Dims = SafeArrayGetDim(array)))
 		{
 			php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims);
-			ZVAL_BOOL(pval_arg, 0);
+			ZVAL_FALSE(pval_arg);
 			return FAILURE;
 		}
         SafeArrayLock( array);
diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index 681bf4f4d1..49a7335ca0 100644
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -161,7 +161,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
 
 		if(!zend_is_true(return_value))
 		{
-			ZVAL_BOOL(object, 0);
+			ZVAL_FALSE(object);
 			return;
 		}
 
@@ -189,7 +189,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 
 	if(!var_arg || (type != IS_VARIANT))
 	{
-		ZVAL_BOOL(&result, 0);
+		ZVAL_FALSE(&result);
 	}
 	else
 	{
@@ -197,7 +197,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 		switch(overloaded_property->type)
 		{
 			case OE_IS_ARRAY:
-				ZVAL_BOOL(&result, 0);
+				ZVAL_FALSE(&result);
 				break;
 
 			case OE_IS_OBJECT:
@@ -211,12 +211,12 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 				}
 				else
 				{
-					ZVAL_BOOL(&result, 0);
+					ZVAL_FALSE(&result);
 					php_error(E_WARNING, "Unknown member.");
 				}
 				break;
 			case OE_IS_METHOD:
-				ZVAL_BOOL(&result, 0);
+				ZVAL_FALSE(&result);
 				php_error(E_WARNING, "Unknown method.");
 				break;
 
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 08a55c7e72..4a6f746147 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -401,7 +401,7 @@ static int checkError(pval *value) {
   if (value->type == IS_EXCEPTION) {
     php_error(E_WARNING, "%s", value->value.str.val);
     efree(value->value.str.val);
-    ZVAL_BOOL(value, 0);
+    ZVAL_FALSE(value);
     return 1;
   };
   return 0;