Refactor bc_divide() to return bool

Return false on division by 0 attempt instead of -1 and true on success instead of 0

Author: Girgias

ext/bcmath/bcmath.c

@@ -344,15 +344,13 @@ PHP_FUNCTION(bcdiv)
 		goto cleanup;
 	}
 
-	switch (bc_divide(first, second, &result, scale)) {
-		case 0: /* OK */
-			RETVAL_STR(bc_num2str_ex(result, scale));
-			break;
-		case -1: /* division by zero */
-			zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Division by zero");
-			break;
+	if (!bc_divide(first, second, &result, scale)) {
+		zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Modulo by zero");
+		goto cleanup;
 	}
 
+	RETVAL_STR(bc_num2str_ex(result, scale));
+
 	cleanup: {
 		bc_free_num(&first);
 		bc_free_num(&second);

ext/bcmath/libbcmath/src/bcmath.h

@@ -118,7 +118,7 @@ void bc_sub(bc_num n1, bc_num n2, bc_num *result, size_t scale_min);
 
 void bc_multiply(bc_num n1, bc_num n2, bc_num *prod, size_t scale);
 
-int bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale);
+bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale);
 
 bool bc_modulo(bc_num num1, bc_num num2, bc_num *resul, size_t scale);
 

ext/bcmath/libbcmath/src/div.c

@@ -72,10 +72,10 @@ static void _one_mult(unsigned char *num, size_t size, int digit, unsigned char
 
 
 /* The full division routine. This computes N1 / N2.  It returns
-   0 if the division is ok and the result is in QUOT.  The number of
-   digits after the decimal point is SCALE. It returns -1 if division
+   true if the division is ok and the result is in QUOT.  The number of
+   digits after the decimal point is SCALE. It returns false if division
    by zero is tried.  The algorithm is found in Knuth Vol 2. p237. */
-int bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
+bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 {
 	bc_num qval;
 	unsigned char *num1, *num2;
@@ -89,7 +89,7 @@ int bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 
 	/* Test for divide by zero. */
 	if (bc_is_zero(n2)) {
-		return -1;
+		return false;
 	}
 
 	/* Test for divide by 1.  If it is we must truncate. */
@@ -254,5 +254,5 @@ int bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 	efree(num2);
 
 	/* Everything is OK. */
-	return 0;
+	return true;
 }