Refactor bc_divmod() and bc_modulo() 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

@@ -400,15 +400,13 @@ PHP_FUNCTION(bcmod)
 		goto cleanup;
 	}
 
-	switch (bc_modulo(first, second, &result, scale)) {
-		case 0:
-			RETVAL_STR(bc_num2str_ex(result, scale));
-			break;
-		case -1:
-			zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Modulo by zero");
-			break;
+	if (!bc_modulo(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

@@ -120,9 +120,9 @@ 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);
 
-int bc_modulo(bc_num num1, bc_num num2, bc_num *resul, size_t scale);
+bool bc_modulo(bc_num num1, bc_num num2, bc_num *resul, size_t scale);
 
-int bc_divmod(bc_num num1, bc_num num2, bc_num *quo, bc_num *rem, size_t scale);
+bool bc_divmod(bc_num num1, bc_num num2, bc_num *quo, bc_num *rem, size_t scale);
 
 typedef enum {
 	OK,

ext/bcmath/libbcmath/src/divmod.c

@@ -30,23 +30,26 @@
 *************************************************************************/
 
 #include "bcmath.h"
+#include <stdbool.h>
 #include <stddef.h>
 
 
 /* Division *and* modulo for numbers.  This computes both NUM1 / NUM2 and
    NUM1 % NUM2  and puts the results in QUOT and REM, except that if QUOT
    is NULL then that store will be omitted.
+   false is returned if divisor is 0.
+   true otherwise for success.
  */
 
-int bc_divmod(bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, size_t scale)
+bool bc_divmod(bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, size_t scale)
 {
 	bc_num quotient = NULL;
 	bc_num temp;
 	size_t rscale;
 
-	/* Check for correct numbers. */
-	if (bc_is_zero (num2)) {
-		return -1;
+	/* Cannot divide/mod by 0. */
+	if (bc_is_zero(num2)) {
+		return false;
 	}
 
 	/* Calculate final scale. */
@@ -67,14 +70,14 @@ int bc_divmod(bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, size_t scale)
 		*quot = quotient;
 	}
 
-	return 0;	/* Everything is OK. */
+	return true;
 }
 
 
 /* Modulo for numbers.  This computes NUM1 % NUM2  and puts the
    result in RESULT.   */
 
-int bc_modulo(bc_num num1, bc_num num2, bc_num *result, size_t scale)
+bool bc_modulo(bc_num num1, bc_num num2, bc_num *result, size_t scale)
 {
 	return bc_divmod(num1, num2, NULL, result, scale);
 }