Commit 21664fb9357 for php.net
commit 21664fb9357a6a89f3b228a6fc7a0d07b396908b
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date: Sat Apr 4 15:53:26 2026 +0200
Convert remaining K&R function declarations in libbcmath
These are already converted in 8.3. Backport minimal changes to 8.2, as the
latest version of Clang on macOS has stopped supporting the K&R syntax.
Closes GH-21636
diff --git a/ext/bcmath/libbcmath/src/add.c b/ext/bcmath/libbcmath/src/add.c
index e92fb0502f0..3d76e028909 100644
--- a/ext/bcmath/libbcmath/src/add.c
+++ b/ext/bcmath/libbcmath/src/add.c
@@ -42,10 +42,7 @@
N1 is added to N2 and the result placed into RESULT. SCALE_MIN
is the minimum scale for the result. */
-void
-bc_add (n1, n2, result, scale_min)
- bc_num n1, n2, *result;
- int scale_min;
+void bc_add(bc_num n1, bc_num n2, bc_num *result, int scale_min)
{
bc_num sum = NULL;
int cmp_res;
diff --git a/ext/bcmath/libbcmath/src/compare.c b/ext/bcmath/libbcmath/src/compare.c
index f7c4a403993..dda2d544fb4 100644
--- a/ext/bcmath/libbcmath/src/compare.c
+++ b/ext/bcmath/libbcmath/src/compare.c
@@ -42,11 +42,7 @@
than N2 and +1 if N1 is greater than N2. If USE_SIGN is false, just
compare the magnitudes. */
- int
-_bc_do_compare (n1, n2, use_sign, ignore_last)
- bc_num n1, n2;
- int use_sign;
- int ignore_last;
+int _bc_do_compare(bc_num n1, bc_num n2, int use_sign, int ignore_last)
{
char *n1ptr, *n2ptr;
int count;
@@ -151,9 +147,7 @@ _bc_do_compare (n1, n2, use_sign, ignore_last)
/* This is the "user callable" routine to compare numbers N1 and N2. */
-int
-bc_compare (n1, n2)
- bc_num n1, n2;
+int bc_compare(bc_num n1, bc_num n2)
{
return _bc_do_compare (n1, n2, TRUE, FALSE);
}
diff --git a/ext/bcmath/libbcmath/src/doaddsub.c b/ext/bcmath/libbcmath/src/doaddsub.c
index fcd768f2929..d3db98167d4 100644
--- a/ext/bcmath/libbcmath/src/doaddsub.c
+++ b/ext/bcmath/libbcmath/src/doaddsub.c
@@ -42,10 +42,7 @@
returned. The signs of N1 and N2 are ignored.
SCALE_MIN is to set the minimum scale of the result. */
- bc_num
-_bc_do_add (n1, n2, scale_min)
- bc_num n1, n2;
- int scale_min;
+bc_num _bc_do_add(bc_num n1, bc_num n2, int scale_min)
{
bc_num sum;
int sum_scale, sum_digits;
@@ -134,10 +131,7 @@ _bc_do_add (n1, n2, scale_min)
assumed to be larger than N2. SCALE_MIN is the minimum scale
of the result. */
- bc_num
-_bc_do_sub (n1, n2, scale_min)
- bc_num n1, n2;
- int scale_min;
+bc_num _bc_do_sub(bc_num n1, bc_num n2, int scale_min)
{
bc_num diff;
int diff_scale, diff_len;
diff --git a/ext/bcmath/libbcmath/src/init.c b/ext/bcmath/libbcmath/src/init.c
index 96e934b34da..79a58ef6bba 100644
--- a/ext/bcmath/libbcmath/src/init.c
+++ b/ext/bcmath/libbcmath/src/init.c
@@ -39,9 +39,7 @@
/* new_num allocates a number and sets fields to known values. */
-bc_num
-_bc_new_num_ex (length, scale, persistent)
- int length, scale, persistent;
+bc_num _bc_new_num_ex(int length, int scale, int persistent)
{
bc_num temp;
/* PHP Change: malloc() -> pemalloc(), removed free_list code */
@@ -61,10 +59,7 @@ _bc_new_num_ex (length, scale, 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 (num, persistent)
- bc_num *num;
- int persistent;
+void _bc_free_num_ex(bc_num *num, int persistent)
{
if (*num == NULL) return;
(*num)->n_refs--;
diff --git a/ext/bcmath/libbcmath/src/int2num.c b/ext/bcmath/libbcmath/src/int2num.c
index 3e675b627a8..274768529a3 100644
--- a/ext/bcmath/libbcmath/src/int2num.c
+++ b/ext/bcmath/libbcmath/src/int2num.c
@@ -40,10 +40,7 @@
/* Convert an integer VAL to a bc number NUM. */
-void
-bc_int2num (num, val)
- bc_num *num;
- int val;
+void bc_int2num(bc_num *num, int val)
{
char buffer[30];
char *bptr, *vptr;
diff --git a/ext/bcmath/libbcmath/src/nearzero.c b/ext/bcmath/libbcmath/src/nearzero.c
index 0986b02b7a9..fab72bedf37 100644
--- a/ext/bcmath/libbcmath/src/nearzero.c
+++ b/ext/bcmath/libbcmath/src/nearzero.c
@@ -41,10 +41,7 @@
Specifically, all but the last digit is 0 and the last digit is 1.
Last digit is defined by scale. */
-char
-bc_is_near_zero (num, scale)
- bc_num num;
- int scale;
+char bc_is_near_zero(bc_num num, int scale)
{
int count;
char *nptr;
diff --git a/ext/bcmath/libbcmath/src/neg.c b/ext/bcmath/libbcmath/src/neg.c
index fe6f95aa34c..748606c185b 100644
--- a/ext/bcmath/libbcmath/src/neg.c
+++ b/ext/bcmath/libbcmath/src/neg.c
@@ -39,9 +39,7 @@
/* In some places we need to check if the number is negative. */
-char
-bc_is_neg (num)
- bc_num num;
+char bc_is_neg(bc_num num)
{
return num->n_sign == MINUS;
}
diff --git a/ext/bcmath/libbcmath/src/num2long.c b/ext/bcmath/libbcmath/src/num2long.c
index e40a126c72c..802c623e81a 100644
--- a/ext/bcmath/libbcmath/src/num2long.c
+++ b/ext/bcmath/libbcmath/src/num2long.c
@@ -42,9 +42,7 @@
a long, this function returns a zero. This can be detected by checking
the NUM for zero after having a zero returned. */
-long
-bc_num2long (num)
- bc_num num;
+long bc_num2long(bc_num num)
{
long val;
char *nptr;
diff --git a/ext/bcmath/libbcmath/src/num2str.c b/ext/bcmath/libbcmath/src/num2str.c
index 39f7adb1f0c..44b05593c94 100644
--- a/ext/bcmath/libbcmath/src/num2str.c
+++ b/ext/bcmath/libbcmath/src/num2str.c
@@ -39,10 +39,7 @@
/* Convert a numbers to a string. Base 10 only.*/
-zend_string
-*bc_num2str_ex (num, scale)
- bc_num num;
- int scale;
+zend_string *bc_num2str_ex(bc_num num, int scale)
{
zend_string *str;
char *sptr;
diff --git a/ext/bcmath/libbcmath/src/rmzero.c b/ext/bcmath/libbcmath/src/rmzero.c
index 5e295c90af4..c1d85c0a91a 100644
--- a/ext/bcmath/libbcmath/src/rmzero.c
+++ b/ext/bcmath/libbcmath/src/rmzero.c
@@ -41,9 +41,7 @@
_bc_rm_leading_zeros just moves the data "value" pointer to the
correct place and adjusts the length. */
- void
-_bc_rm_leading_zeros (num)
- bc_num num;
+void _bc_rm_leading_zeros(bc_num num)
{
/* We can move n_value to point to the first non zero digit! */
while (*num->n_value == 0 && num->n_len > 1) {
diff --git a/ext/bcmath/libbcmath/src/sub.c b/ext/bcmath/libbcmath/src/sub.c
index 2949c71fbb6..9da5e892db9 100644
--- a/ext/bcmath/libbcmath/src/sub.c
+++ b/ext/bcmath/libbcmath/src/sub.c
@@ -42,10 +42,7 @@
N2 is subtracted from N1 and the result placed in RESULT. SCALE_MIN
is the minimum scale for the result. */
-void
-bc_sub (n1, n2, result, scale_min)
- bc_num n1, n2, *result;
- int scale_min;
+void bc_sub(bc_num n1, bc_num n2, bc_num *result, int scale_min)
{
bc_num diff = NULL;
int cmp_res;