pollita Tue Feb 4 16:39:50 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/bcmath bcmath.c
Log:
FMH(r-1.49/r-1.50)
Index: php4/ext/bcmath/bcmath.c
diff -u php4/ext/bcmath/bcmath.c:1.39.4.4 php4/ext/bcmath/bcmath.c:1.39.4.5
--- php4/ext/bcmath/bcmath.c:1.39.4.4 Tue Feb 4 14:02:02 2003
+++ php4/ext/bcmath/bcmath.c Tue Feb 4 16:39:50 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bcmath.c,v 1.39.4.4 2003/02/04 19:02:02 pollita Exp $ */
+/* $Id: bcmath.c,v 1.39.4.5 2003/02/04 21:39:50 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -112,7 +112,8 @@
/* {{{ php_str2num
Convert to bc_num detecting scale */
-static void php_str2num(bc_num *num, char *str) {
+static void php_str2num(bc_num *num, char *str TSRMLS_DC)
+{
char *p;
if (!(p = strchr(str, '.'))) {
@@ -154,8 +155,8 @@
bc_init_num(&first TSRMLS_CC);
bc_init_num(&second TSRMLS_CC);
bc_init_num(&result TSRMLS_CC);
- php_str2num(&first, Z_STRVAL_PP(left));
- php_str2num(&second, Z_STRVAL_PP(right));
+ php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_add (first, second, &result, scale);
result->n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -198,8 +199,8 @@
bc_init_num(&first TSRMLS_CC);
bc_init_num(&second TSRMLS_CC);
bc_init_num(&result TSRMLS_CC);
- php_str2num(&first, Z_STRVAL_PP(left));
- php_str2num(&second, Z_STRVAL_PP(right));
+ php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_sub (first, second, &result, scale);
result->n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -242,8 +243,8 @@
bc_init_num(&first TSRMLS_CC);
bc_init_num(&second TSRMLS_CC);
bc_init_num(&result TSRMLS_CC);
- php_str2num(&first, Z_STRVAL_PP(left));
- php_str2num(&second, Z_STRVAL_PP(right));
+ php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_multiply (first, second, &result, scale TSRMLS_CC);
result->n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -286,8 +287,8 @@
bc_init_num(&first TSRMLS_CC);
bc_init_num(&second TSRMLS_CC);
bc_init_num(&result TSRMLS_CC);
- php_str2num(&first, Z_STRVAL_PP(left));
- php_str2num(&second, Z_STRVAL_PP(right));
+ php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
switch (bc_divide (first, second, &result, scale TSRMLS_CC)) {
case 0: /* OK */
result->n_scale = scale;
@@ -377,8 +378,8 @@
bc_init_num(&first TSRMLS_CC);
bc_init_num(&second TSRMLS_CC);
bc_init_num(&result TSRMLS_CC);
- php_str2num(&first, Z_STRVAL_PP(left));
- php_str2num(&second, Z_STRVAL_PP(right));
+ php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_raise (first, second, &result, scale TSRMLS_CC);
result->n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -418,7 +419,7 @@
}
convert_to_string_ex(left);
bc_init_num(&result TSRMLS_CC);
- php_str2num(&result, Z_STRVAL_PP(left));
+ php_str2num(&result, Z_STRVAL_PP(left) TSRMLS_CC);
if (bc_sqrt (&result, scale TSRMLS_CC) != 0) {
result->n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
