com php-src: fixed ext/bcmath: ext/bcmath/bcmath.c ext/bcmath/p hp_bcmath.h

From: Date: Wed, 04 Dec 2013 14:06:32 +0000
Subject: com php-src: fixed ext/bcmath: ext/bcmath/bcmath.c ext/bcmath/p hp_bcmath.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74239@lists.php.net to get a copy of this message
Commit: 7228ac190a9d703f43fb57b6d6b395ab38e96ac0 Author: Anatol Belski <ab@php.net> Wed, 4 Dec 2013 15:06:32 +0100 Parents: 3142989a1469447163ba0c4e10db483b45c55c63 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7228ac190a9d703f43fb57b6d6b395ab38e96ac0 Log: fixed ext/bcmath Changed paths: M ext/bcmath/bcmath.c M ext/bcmath/php_bcmath.h

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index c5fbce9..ba2f2d0 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -206,12 +206,13 @@ static void php_str2num(bc_num *num, char *str TSRMLS_DC) PHP_FUNCTION(bcadd) { char *left, *right; - long scale_param = 0; + php_int_t scale_param = 0; bc_num first, second, result; - int left_len, right_len; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + zend_str_size_int left_len, right_len; + php_int_t scale = BCG(bc_precision); + int 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; } @@ -231,7 +232,7 @@ PHP_FUNCTION(bcadd) } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; bc_free_num(&first); bc_free_num(&second); @@ -245,12 +246,13 @@ PHP_FUNCTION(bcadd) PHP_FUNCTION(bcsub) { char *left, *right; - int left_len, right_len; - long scale_param = 0; + zend_str_size_int left_len, right_len; + php_int_t scale_param = 0; bc_num first, second, result; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + php_int_t scale = BCG(bc_precision); + int 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; } @@ -270,7 +272,7 @@ PHP_FUNCTION(bcsub) } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; bc_free_num(&first); bc_free_num(&second); @@ -284,12 +286,13 @@ PHP_FUNCTION(bcsub) PHP_FUNCTION(bcmul) { char *left, *right; - int left_len, right_len; - long scale_param = 0; + zend_str_size_int left_len, right_len; + php_int_t scale_param = 0; bc_num first, second, result; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + php_int_t scale = BCG(bc_precision); + int 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; } @@ -309,7 +312,7 @@ PHP_FUNCTION(bcmul) } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; bc_free_num(&first); bc_free_num(&second); @@ -323,12 +326,13 @@ PHP_FUNCTION(bcmul) PHP_FUNCTION(bcdiv) { char *left, *right; - int left_len, right_len; - long scale_param = 0; + zend_str_size_int left_len, right_len; + php_int_t scale_param = 0; bc_num first, second, result; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + php_int_t scale = BCG(bc_precision); + int 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; } @@ -348,7 +352,7 @@ PHP_FUNCTION(bcdiv) result->n_scale = scale; } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; break; case -1: /* division by zero */ @@ -368,10 +372,10 @@ PHP_FUNCTION(bcdiv) PHP_FUNCTION(bcmod) { char *left, *right; - int left_len, right_len; + zend_str_size_int 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) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &left, &left_len, &right, &right_len) == FAILURE) { return; } @@ -384,7 +388,7 @@ PHP_FUNCTION(bcmod) switch (bc_modulo(first, second, &result, 0 TSRMLS_CC)) { case 0: Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; break; case -1: @@ -404,12 +408,12 @@ PHP_FUNCTION(bcmod) PHP_FUNCTION(bcpowmod) { char *left, *right, *modulous; - int left_len, right_len, modulous_len; + zend_str_size_int left_len, right_len, modulous_len; bc_num first, second, mod, result; - long scale = BCG(bc_precision); + php_int_t scale = BCG(bc_precision); 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; } @@ -428,7 +432,7 @@ PHP_FUNCTION(bcpowmod) result->n_scale = scale; } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; } else { RETVAL_FALSE; @@ -447,12 +451,13 @@ PHP_FUNCTION(bcpowmod) PHP_FUNCTION(bcpow) { char *left, *right; - int left_len, right_len; - long scale_param = 0; + zend_str_size_int left_len, right_len; + php_int_t scale_param = 0; bc_num first, second, result; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + php_int_t scale = BCG(bc_precision); + int 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; } @@ -472,7 +477,7 @@ PHP_FUNCTION(bcpow) } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; bc_free_num(&first); bc_free_num(&second); @@ -486,12 +491,13 @@ PHP_FUNCTION(bcpow) PHP_FUNCTION(bcsqrt) { char *left; - int left_len; - long scale_param = 0; + zend_str_size_int left_len; + php_int_t scale_param = 0; bc_num result; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + php_int_t scale = BCG(bc_precision); + int 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; } @@ -507,7 +513,7 @@ PHP_FUNCTION(bcsqrt) result->n_scale = scale; } Z_STRVAL_P(return_value) = bc_num2str(result); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); + Z_STRSIZE_P(return_value) = strlen(Z_STRVAL_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Square root of negative number"); @@ -523,12 +529,13 @@ PHP_FUNCTION(bcsqrt) PHP_FUNCTION(bccomp) { char *left, *right; - int left_len, right_len; - long scale_param = 0; + zend_str_size_int left_len, right_len; + php_int_t scale_param = 0; bc_num first, second; - int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS(); + php_int_t scale = BCG(bc_precision); + int 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; } @@ -554,9 +561,9 @@ PHP_FUNCTION(bccomp) Sets default scale parameter for all bc math functions */ 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; } diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h index 571993e..e8adfd2 100644 --- a/ext/bcmath/php_bcmath.h +++ b/ext/bcmath/php_bcmath.h @@ -45,7 +45,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath) bc_num _zero_; bc_num _one_; bc_num _two_; - long bc_precision; + php_int_t bc_precision; ZEND_END_MODULE_GLOBALS(bcmath) #ifdef ZTS
« previous php.cvs (#74239) next »