diff options
Diffstat (limited to 'ext/bcmath/bcmath.c')
-rw-r--r-- | ext/bcmath/bcmath.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index b45a738a04..7ef30cad5e 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -206,12 +206,12 @@ static void php_str2num(bc_num *num, char *str TSRMLS_DC) PHP_FUNCTION(bcadd) { char *left, *right; - php_int_t scale_param = 0; + zend_long scale_param = 0; bc_num first, second, result; - int left_len, right_len; + size_t left_len, right_len; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { return; } @@ -243,12 +243,12 @@ PHP_FUNCTION(bcadd) PHP_FUNCTION(bcsub) { char *left, *right; - int left_len, right_len; - php_int_t scale_param = 0; + size_t left_len, right_len; + zend_long scale_param = 0; bc_num first, second, result; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { return; } @@ -280,12 +280,12 @@ PHP_FUNCTION(bcsub) PHP_FUNCTION(bcmul) { char *left, *right; - int left_len, right_len; - php_int_t scale_param = 0; + size_t left_len, right_len; + zend_long scale_param = 0; bc_num first, second, result; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { return; } @@ -317,12 +317,12 @@ PHP_FUNCTION(bcmul) PHP_FUNCTION(bcdiv) { char *left, *right; - int left_len, right_len; - php_int_t scale_param = 0; + size_t left_len, right_len; + zend_long scale_param = 0; bc_num first, second, result; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { return; } @@ -360,7 +360,7 @@ PHP_FUNCTION(bcdiv) PHP_FUNCTION(bcmod) { char *left, *right; - int left_len, right_len; + size_t left_len, right_len; bc_num first, second, result; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &left, &left_len, &right, &right_len) == FAILURE) { @@ -394,12 +394,12 @@ PHP_FUNCTION(bcmod) PHP_FUNCTION(bcpowmod) { char *left, *right, *modulous; - int left_len, right_len, modulous_len; + size_t left_len, right_len, modulous_len; bc_num first, second, mod, result; - php_int_t scale = BCG(bc_precision); + zend_long scale = BCG(bc_precision); int scale_int; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|i", &left, &left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|l", &left, &left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) { return; } @@ -435,12 +435,12 @@ PHP_FUNCTION(bcpowmod) PHP_FUNCTION(bcpow) { char *left, *right; - int left_len, right_len; - php_int_t scale_param = 0; + size_t left_len, right_len; + zend_long scale_param = 0; bc_num first, second, result; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { return; } @@ -472,12 +472,12 @@ PHP_FUNCTION(bcpow) PHP_FUNCTION(bcsqrt) { char *left; - int left_len; - php_int_t scale_param = 0; + size_t left_len; + zend_long scale_param = 0; bc_num result; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "s|i", &left, &left_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "s|l", &left, &left_len, &scale_param) == FAILURE) { return; } @@ -507,12 +507,12 @@ PHP_FUNCTION(bcsqrt) PHP_FUNCTION(bccomp) { char *left, *right; - int left_len, right_len; - php_int_t scale_param = 0; + size_t left_len, right_len; + zend_long scale_param = 0; bc_num first, second; int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "ss|i", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "ss|l", &left, &left_len, &right, &right_len, &scale_param) == FAILURE) { return; } @@ -525,7 +525,7 @@ PHP_FUNCTION(bccomp) bc_str2num(&first, left, scale TSRMLS_CC); bc_str2num(&second, right, scale TSRMLS_CC); - RETVAL_INT(bc_compare(first, second)); + RETVAL_LONG(bc_compare(first, second)); bc_free_num(&first); bc_free_num(&second); @@ -537,9 +537,9 @@ PHP_FUNCTION(bccomp) Sets default scale parameter for all bc math functions */ PHP_FUNCTION(bcscale) { - php_int_t new_scale; + zend_long new_scale; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &new_scale) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &new_scale) == FAILURE) { return; } |