BCmath extension code reformatting

ext/bcmath/libbcmath/src/compare.c

@@ -45,9 +45,11 @@ int _bc_do_compare(bc_num n1, bc_num n2, bool use_sign, bool ignore_last)
 	/* First, compare signs. */
 	if (use_sign && n1->n_sign != n2->n_sign) {
 		if (n1->n_sign == PLUS) {
-			return (1);    /* Positive N1 > Negative N2 */
+			/* Positive N1 > Negative N2 */
+			return (1);
 		} else {
-			return (-1);    /* Negative N1 < Positive N1 */
+			/* Negative N1 < Positive N1 */
+			return (-1);
 		}
 	}
 

ext/bcmath/libbcmath/src/debug.c

@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include "bcmath.h"
 #include "private.h"
+#include <stddef.h>
 
 /* pn prints the number NUM in base 10. */
 

ext/bcmath/libbcmath/src/div.c

@@ -86,6 +86,7 @@ bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 	unsigned int qdig, qguess, borrow, carry;
 	unsigned char *mval;
 	unsigned int norm;
+	bool zero;
 
 	/* Test for divide by zero. */
 	if (bc_is_zero(n2)) {
@@ -130,10 +131,17 @@ bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 	}
 
 	/* Calculate the number of quotient digits. */
-	if (len2 > len1 + scale || len2 > len1) {
+	if (len2 > len1 + scale) {
 		qdigits = scale + 1;
+		zero = true;
 	} else {
-		qdigits = len1 - len2 + scale + 1;
+		zero = false;
+		if (len2 > len1) {
+			/* One for the zero integer part. */
+			qdigits = scale + 1;
+		} else {
+			qdigits = len1 - len2 + scale + 1;
+		}
 	}
 
 	/* Allocate and zero the storage for the quotient. */
@@ -144,7 +152,7 @@ bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 	mval = (unsigned char *) safe_emalloc(1, len2, 1);
 
 	/* Now for the full divide algorithm. */
-	if (len2 <= len1 + scale) {
+	if (!zero) {
 		/* Normalize */
 		norm = 10 / ((int) *n2ptr + 1);
 		if (norm != 1) {
@@ -170,14 +178,10 @@ bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
 			}
 
 			/* Test qguess. */
-			if (
-					n2ptr[1] * qguess > (num1[qdig] * 10 + num1[qdig + 1] - *n2ptr * qguess) * 10 + num1[qdig + 2]
-					) {
+			if (n2ptr[1] * qguess > (num1[qdig] * 10 + num1[qdig + 1] - *n2ptr * qguess) * 10 + num1[qdig + 2]) {
 				qguess--;
 				/* And again. */
-				if (
-						n2ptr[1] * qguess > (num1[qdig] * 10 + num1[qdig + 1] - *n2ptr * qguess) * 10 + num1[qdig + 2]
-						) {
+				if (n2ptr[1] * qguess > (num1[qdig] * 10 + num1[qdig + 1] - *n2ptr * qguess) * 10 + num1[qdig + 2]) {
 					qguess--;
 				}
 			}

ext/bcmath/libbcmath/src/doaddsub.c

@@ -31,6 +31,7 @@
 
 #include "bcmath.h"
 #include "private.h"
+#include <stddef.h>
 
 
 /* Perform addition: N1 is added to N2 and the value is

ext/bcmath/libbcmath/src/init.c

@@ -38,11 +38,13 @@
 /* new_num allocates a number and sets fields to known values. */
 bc_num _bc_new_num_ex(size_t length, size_t scale, bool persistent)
 {
+	/* PHP Change: malloc() -> pemalloc(), removed free_list code */
 	bc_num temp = (bc_num) safe_pemalloc(1, sizeof(bc_struct) + length, scale, persistent);
 	temp->n_sign = PLUS;
 	temp->n_len = length;
 	temp->n_scale = scale;
 	temp->n_refs = 1;
+	/* PHP Change: malloc() -> pemalloc() */
 	temp->n_ptr = (char *) safe_pemalloc(1, length, scale, persistent);
 	temp->n_value = temp->n_ptr;
 	memset(temp->n_ptr, 0, length + scale);

ext/bcmath/libbcmath/src/int2num.c

@@ -55,7 +55,8 @@ void bc_int2num(bc_num *num, int val)
 	while (val != 0) {
 		*bptr++ = val % BASE;
 		val = val / BASE;
-		ix++;        /* Count the digits. */
+		/* Count the digits. */
+		ix++;
 	}
 
 	/* Make the number. */

ext/bcmath/libbcmath/src/nearzero.c

@@ -31,6 +31,7 @@
 
 #include <stdbool.h>
 #include "bcmath.h"
+#include <stddef.h>
 
 /* In some places we need to check if the number NUM is almost zero.
    Specifically, all but the last digit is 0 and the last digit is 1.
@@ -52,9 +53,5 @@ bool bc_is_near_zero(bc_num num, size_t scale)
 		count--;
 	}
 
-	if (count == 0 || (count == 1 && *--nptr == 1)) {
-		return true;
-	} else {
-		return false;
-	}
+	return count == 0 || (count == 1 && *--nptr == 1);
 }

ext/bcmath/libbcmath/src/num2long.c

@@ -30,6 +30,7 @@
 *************************************************************************/
 
 #include "bcmath.h"
+#include <stddef.h>
 
 /* Convert a number NUM to a long.  The function returns only the integer
    part of the number.  For numbers that are too large to represent as
@@ -40,7 +41,7 @@ long bc_num2long(bc_num num)
 {
 	/* Extract the int value, ignore the fraction. */
 	long val = 0;
-	char *nptr = num->n_value;
+	const char *nptr = num->n_value;
 	for (size_t index = num->n_len; index > 0; index--) {
 		char n = *nptr++;
 

ext/bcmath/libbcmath/src/num2str.c

@@ -38,8 +38,9 @@ zend_string *bc_num2str_ex(bc_num num, size_t scale)
 {
 	zend_string *str;
 	char *sptr;
-	char *nptr;
-	int index, signch;
+	const char *nptr = num->n_value;;
+	size_t index;
+	int signch;
 
 	/* Number of sign chars. */
 	signch = num->n_sign != PLUS && !bc_is_zero_for_scale(num, MIN(num->n_scale, scale));
@@ -55,7 +56,6 @@ zend_string *bc_num2str_ex(bc_num num, size_t scale)
 	if (signch) *sptr++ = '-';
 
 	/* Load the whole number. */
-	nptr = num->n_value;
 	for (index = num->n_len; index > 0; index--) {
 		*sptr++ = BCD_CHAR(*nptr++);
 	}
@@ -73,6 +73,6 @@ zend_string *bc_num2str_ex(bc_num num, size_t scale)
 
 	/* Terminate the string and return it! */
 	*sptr = '\0';
-	ZSTR_LEN(str) = sptr - (char *) ZSTR_VAL(str);
-	return str;
+	ZSTR_LEN(str) = sptr - ZSTR_VAL(str);
+	return (zend_string*)str;
 }

ext/bcmath/libbcmath/src/raise.c

@@ -32,6 +32,7 @@
 #include "bcmath.h"
 #include <assert.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 
 /* Raise NUM1 to the NUM2 power.  The result is placed in RESULT.
@@ -41,7 +42,9 @@
 void bc_raise(bc_num num1, long exponent, bc_num *result, size_t scale)
 {
 	bc_num temp, power;
-	size_t rscale, pwrscale, calcscale;
+	size_t rscale;
+	size_t pwrscale;
+	size_t calcscale;
 	bool is_neg;
 
 	/* Special case if exponent is a zero. */

ext/bcmath/libbcmath/src/raisemod.c

@@ -30,6 +30,7 @@
 *************************************************************************/
 
 #include "bcmath.h"
+#include <stddef.h>
 
 /* Raise BASE to the EXPO power, reduced modulo MOD.  The result is placed in RESULT. */
 raise_mod_status bc_raisemod(bc_num base, bc_num expo, bc_num mod, bc_num *result, size_t scale)

ext/bcmath/libbcmath/src/recmul.c

@@ -171,8 +171,7 @@ static void _bc_rec_mul(bc_num u, size_t ulen, bc_num v, size_t vlen, bc_num *pr
 	/* Base case? */
 	if ((ulen + vlen) < mul_base_digits
 		|| ulen < MUL_SMALL_DIGITS
-		|| vlen < MUL_SMALL_DIGITS
-			) {
+		|| vlen < MUL_SMALL_DIGITS) {
 		_bc_simp_mul(u, ulen, v, vlen, prod);
 		return;
 	}

ext/bcmath/libbcmath/src/sqrt.c

@@ -31,6 +31,7 @@
 
 #include "bcmath.h"
 #include <stdbool.h>
+#include <stddef.h>
 
 /* Take the square root NUM and return it in NUM with SCALE digits
    after the decimal place. */

ext/bcmath/libbcmath/src/str2num.c

@@ -31,6 +31,7 @@
 
 #include "bcmath.h"
 #include <stdbool.h>
+#include <stddef.h>
 
 /* Convert strings to bc numbers.  Base 10 only.*/
 

ext/bcmath/libbcmath/src/zero.c

@@ -31,6 +31,7 @@
 
 #include "bcmath.h"
 #include <stdbool.h>
+#include <stddef.h>
 
 /* In some places we need to check if the number NUM is zero. */