From 512b6c74bedde9fb5f395ff0a75e3dca32e52ac5 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 7 Nov 2017 16:37:31 +0100 Subject: [PATCH] Don't reintroduce split_bc_num() This function has been removed in 870ed5106d6274905b5aa4341429deef12c92e55, because it is not necessary to manipulate the `bc_num` itself; instead we simply omit extraneous decimals when converting the number to string. This resolves the issue introduced by 24fd49fbabc7c5ad941095f33d05fe2e41ff667d in a cleaner way than 121d193514cbf59450a7dee0ad2e883101cbe9dd. --- ext/bcmath/bcmath.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 121d193514..1b39f4905d 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -208,21 +208,6 @@ static void php_str2num(bc_num *num, char *str) } /* }}} */ -/* {{{ split_bc_num - Convert to bc_num detecting scale */ -static bc_num split_bc_num(bc_num num) { - bc_num newnum; - if (num->n_refs >= 1) { - return num; - } - newnum = _bc_new_num_ex(0, 0, 0); - *newnum = *num; - newnum->n_refs = 1; - num->n_refs--; - return newnum; -} -/* }}} */ - /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale]) Returns the sum of two arbitrary precision numbers */ PHP_FUNCTION(bcadd) @@ -398,11 +383,7 @@ PHP_FUNCTION(bcmod) switch (bc_modulo(first, second, &result, scale)) { case 0: - if (result->n_scale > scale) { - result = split_bc_num(result); - result->n_scale = scale; - } - RETVAL_STR(bc_num2str(result)); + RETVAL_STR(bc_num2str_ex(result, scale)); break; case -1: php_error_docref(NULL, E_WARNING, "Division by zero"); -- 2.50.1