archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixes to ext/bcmath

Browse source
This commit is contained in:
Anatol Belski 2014-08-19 10:30:43 +02:00
parent 5dc4f44f3e
commit ae470a8e82
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
ext/bcmath/bcmath.c
View file

@ -206,12 +206,12 @@ static void php_str2num(bc_num *num, char *str TSRMLS_DC)
PHP_FUNCTION(bcadd) PHP_FUNCTION(bcadd)
{ {
char *left, *right; char *left, *right;
long scale_param = 0; php_int_t scale_param = 0;
bc_num first, second, result; bc_num first, second, result;
int left_len, right_len; int left_len, right_len;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
return; return;
} }
@ -244,11 +244,11 @@ PHP_FUNCTION(bcsub)
{ {
char *left, *right; char *left, *right;
int left_len, right_len; int left_len, right_len;
long scale_param = 0; php_int_t scale_param = 0;
bc_num first, second, result; bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
return; return;
} }
@ -281,11 +281,11 @@ PHP_FUNCTION(bcmul)
{ {
char *left, *right; char *left, *right;
int left_len, right_len; int left_len, right_len;
long scale_param = 0; php_int_t scale_param = 0;
bc_num first, second, result; bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
return; return;
} }
@ -318,11 +318,11 @@ PHP_FUNCTION(bcdiv)
{ {
char *left, *right; char *left, *right;
int left_len, right_len; int left_len, right_len;
long scale_param = 0; php_int_t scale_param = 0;
bc_num first, second, result; bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
return; return;
} }
@ -396,10 +396,10 @@ PHP_FUNCTION(bcpowmod)
char *left, *right, *modulous; char *left, *right, *modulous;
int left_len, right_len, modulous_len; int left_len, right_len, modulous_len;
bc_num first, second, mod, result; bc_num first, second, mod, result;
long scale = BCG(bc_precision); php_int_t scale = BCG(bc_precision);
int scale_int; int scale_int;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|l", &left, &left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|i", &left, &left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) {
return; return;
} }
@ -436,11 +436,11 @@ PHP_FUNCTION(bcpow)
{ {
char *left, *right; char *left, *right;
int left_len, right_len; int left_len, right_len;
long scale_param = 0; php_int_t scale_param = 0;
bc_num first, second, result; bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
return; return;
} }
@ -473,11 +473,11 @@ PHP_FUNCTION(bcsqrt)
{ {
char *left; char *left;
int left_len; int left_len;
long scale_param = 0; php_int_t scale_param = 0;
bc_num result; bc_num result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "s|l", &left, &left_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "s|i", &left, &left_len, &scale_param) == FAILURE) {
return; return;
} }
@ -508,11 +508,11 @@ PHP_FUNCTION(bccomp)
{ {
char *left, *right; char *left, *right;
int left_len, right_len; int left_len, right_len;
long scale_param = 0; php_int_t scale_param = 0;
bc_num first, second; bc_num first, second;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) {
return; return;
} }
@ -537,9 +537,9 @@ PHP_FUNCTION(bccomp)
Sets default scale parameter for all bc math functions */ Sets default scale parameter for all bc math functions */
PHP_FUNCTION(bcscale) PHP_FUNCTION(bcscale)
{ {
long new_scale; php_int_t new_scale;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &new_scale) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &new_scale) == FAILURE) {
return; return;
} }

2
ext/bcmath/php_bcmath.h
View file

@ -45,7 +45,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath)
bc_num _zero_; bc_num _zero_;
bc_num _one_; bc_num _one_;
bc_num _two_; bc_num _two_;
long bc_precision; php_int_t bc_precision;
ZEND_END_MODULE_GLOBALS(bcmath) ZEND_END_MODULE_GLOBALS(bcmath)
#ifdef ZTS #ifdef ZTS