ext/bcmath: Use standard C99 bool type instead of char

Author: Girgias

ext/bcmath/libbcmath/src/bcmath.h

@@ -75,11 +75,6 @@ typedef struct bc_struct {
 #define MIN(a, b)      ((a)>(b)?(b):(a))
 #define ODD(a)        ((a)&1)
 
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-
 #ifndef LONG_MAX
 #define LONG_MAX 0x7ffffff
 #endif
@@ -89,15 +84,15 @@ typedef struct bc_struct {
 
 void bc_init_numbers(void);
 
-bc_num _bc_new_num_ex(int length, int scale, int persistent);
+bc_num _bc_new_num_ex(int length, int scale, bool persistent);
 
-void _bc_free_num_ex(bc_num *num, int persistent);
+void _bc_free_num_ex(bc_num *num, bool persistent);
 
 bc_num bc_copy_num(bc_num num);
 
 void bc_init_num(bc_num *num);
 
-int bc_str2num(bc_num *num, char *str, int scale);
+bool bc_str2num(bc_num *num, char *str, int scale);
 
 zend_string *bc_num2str_ex(bc_num num, int scale);
 
@@ -107,9 +102,9 @@ long bc_num2long(bc_num num);
 
 int bc_compare(bc_num n1, bc_num n2);
 
-char bc_is_zero(bc_num num);
+bool bc_is_zero(bc_num num);
 
-char bc_is_zero_for_scale(bc_num num, int scale);
+bool bc_is_zero_for_scale(bc_num num, int scale);
 
 bool bc_is_near_zero(bc_num num, int scale);
 
@@ -133,7 +128,7 @@ void bc_raise(bc_num num1, bc_num num2, bc_num *resul, int scale);
 
 bool bc_sqrt(bc_num *num, int scale);
 
-void bc_out_num(bc_num num, int o_base, void (* out_char)(char), int leading_zero);
+void bc_out_num(bc_num num, int o_base, void (* out_char)(char), bool leading_zero);
 
 /* Prototypes needed for external utility routines. */
 #define bc_new_num(length, scale)	_bc_new_num_ex((length), (scale), 0)

ext/bcmath/libbcmath/src/div.c

@@ -32,6 +32,7 @@
 #include "config.h" /* For safe_emalloc() */
 #include "bcmath.h"
 #include "private.h"
+#include <stdbool.h>
 
 
 /* Some utility routines for the divide:  First a one digit multiply.
@@ -82,7 +83,7 @@ int bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 	unsigned int  len1, len2, scale2, qdigits, extra, count;
 	unsigned int  qdig, qguess, borrow, carry;
 	unsigned char *mval;
-	char zero;
+	bool zero;
 	unsigned int  norm;
 
 	/* Test for divide by zero. */
@@ -134,9 +135,9 @@ int bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 	/* Calculate the number of quotient digits. */
 	if (len2 > len1+scale) {
 		qdigits = scale+1;
-		zero = TRUE;
+		zero = true;
 	} else {
-		zero = FALSE;
+		zero = false;
 		if (len2 > len1) {
 			/* One for the zero integer part. */
 			qdigits = scale+1;

ext/bcmath/libbcmath/src/init.c

@@ -30,10 +30,11 @@
 *************************************************************************/
 
 #include "config.h"
+#include <stdbool.h>
 #include "bcmath.h"
 
 /* new_num allocates a number and sets fields to known values. */
-bc_num _bc_new_num_ex(int length, int scale, int persistent)
+bc_num _bc_new_num_ex(int length, int scale, bool persistent)
 {
 	bc_num temp;
 	/* PHP Change: malloc() -> pemalloc(), removed free_list code */
@@ -52,7 +53,7 @@ bc_num _bc_new_num_ex(int length, int scale, int persistent)
 
 /* "Frees" a bc_num NUM.  Actually decreases reference count and only
    frees the storage if reference count is zero. */
-void _bc_free_num_ex(bc_num *num, int persistent)
+void _bc_free_num_ex(bc_num *num, bool persistent)
 {
 	if (*num == NULL) {
 		return;

ext/bcmath/libbcmath/src/output.c

@@ -31,6 +31,7 @@
 
 #include "config.h" /* For emalloc */
 #include "bcmath.h"
+#include <stdbool.h>
 
 
 /* The following routines provide output for bcd numbers package
@@ -71,7 +72,7 @@ void bc_out_long (long val, size_t size, bool space, void (*out_char)(char) )
 /* Output of a bcd number.  NUM is written in base O_BASE using OUT_CHAR
    as the routine to do the actual output of the characters. */
 
-void bc_out_num (bc_num num, int o_base, void (*out_char)(char), int leading_zero)
+void bc_out_num (bc_num num, int o_base, void (*out_char)(char), bool leading_zero)
 {
 	char *nptr;
 	int  index, fdigit;

ext/bcmath/libbcmath/src/recmul.c

@@ -31,6 +31,7 @@
 
 #include "bcmath.h"
 #include <assert.h>
+#include <stdbool.h>
 #include "config.h" /* For emalloc() */
 #include "private.h" /* For _bc_rm_leading_zeros() */
 
@@ -96,7 +97,7 @@ static void _bc_simp_mul(bc_num n1, int n1len, bc_num n2, int n2len, bc_num *pro
    multiply algorithm.  Note: if sub is called, accum must
    be larger that what is being subtracted.  Also, accum and val
    must have n_scale = 0.  (e.g. they must look like integers. *) */
-static void _bc_shift_addsub (bc_num accum, bc_num val, int shift, int sub)
+static void _bc_shift_addsub (bc_num accum, bc_num val, int shift, bool sub)
 {
 	signed char *accp, *valp;
 	int  count, carry;

ext/bcmath/libbcmath/src/str2num.c

@@ -30,14 +30,15 @@
 *************************************************************************/
 
 #include "bcmath.h"
+#include <stdbool.h>
 
 /* Convert strings to bc numbers.  Base 10 only.*/
 
-int bc_str2num (bc_num *num, char *str, int scale)
+bool bc_str2num (bc_num *num, char *str, int scale)
 {
 	int digits, strscale;
 	char *ptr, *nptr;
-	char zero_int;
+	bool zero_int = false;
 
 	/* Prepare num. */
 	bc_free_num (num);
@@ -46,7 +47,7 @@ int bc_str2num (bc_num *num, char *str, int scale)
 	ptr = str;
 	digits = 0;
 	strscale = 0;
-	zero_int = FALSE;
+
 	if ( (*ptr == '+') || (*ptr == '-')) {
 		/* Skip Sign */
 		ptr++;
@@ -77,7 +78,7 @@ int bc_str2num (bc_num *num, char *str, int scale)
 	/* Adjust numbers and allocate storage and initialize fields. */
 	strscale = MIN(strscale, scale);
 	if (digits == 0) {
-		zero_int = TRUE;
+		zero_int = true;
 		digits = 1;
 	}
 	*num = bc_new_num (digits, strscale);
@@ -117,5 +118,5 @@ int bc_str2num (bc_num *num, char *str, int scale)
 		(*num)->n_sign = PLUS;
 	}
 
-	return 1;
+	return true;
 }

ext/bcmath/libbcmath/src/sub.c

@@ -31,6 +31,7 @@
 
 #include "bcmath.h"
 #include "private.h"
+#include <stdbool.h>
 
 /* Here is the full subtract routine that takes care of negative numbers.
    N2 is subtracted from N1 and the result placed in RESULT.  SCALE_MIN
@@ -48,7 +49,7 @@ void bc_sub(bc_num n1, bc_num n2, bc_num *result, int scale_min)
 	} else {
 		/* subtraction must be done. */
 		/* Compare magnitudes. */
-		cmp_res = _bc_do_compare (n1, n2, FALSE, FALSE);
+		cmp_res = _bc_do_compare(n1, n2, false, false);
 		switch (cmp_res) {
 			case -1:
 				/* n1 is less than n2, subtract n1 from n2. */

ext/bcmath/libbcmath/src/zero.c

@@ -30,16 +30,19 @@
 *************************************************************************/
 
 #include "bcmath.h"
+#include <stdbool.h>
 
 /* In some places we need to check if the number NUM is zero. */
 
-char bc_is_zero_for_scale (bc_num num, int scale)
+bool bc_is_zero_for_scale (bc_num num, int scale)
 {
 	int  count;
 	char *nptr;
 
 	/* Quick check. */
-	if (num == BCG(_zero_)) return TRUE;
+	if (num == BCG(_zero_)) {
+		return true;
+	}
 
 	/* Initialize */
 	count = num->n_len + scale;
@@ -51,7 +54,7 @@ char bc_is_zero_for_scale (bc_num num, int scale)
 	return count == 0;
 }
 
-char bc_is_zero (bc_num num)
+bool bc_is_zero(bc_num num)
 {
 	return bc_is_zero_for_scale(num, num->n_scale);
 }