tony2001 Wed Mar 19 12:42:16 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
/php-src/main main.c
Log:
MFH: make use of zend_atol()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.21&r2=1.725.2.31.2.64.2.22&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.21
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.22
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.21 Mon Mar 10
22:12:36 2008
+++ php-src/ext/standard/basic_functions.c Wed Mar 19 12:42:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.21 2008/03/10 22:12:36 felipe
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.22 2008/03/19 12:42:16 tony2001
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -6128,7 +6128,7 @@
}
if (!(Z_STRLEN_P(arg1) > 1 && Z_STRVAL_P(arg1)[0] ==
'0') && is_numeric_string(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), NULL, NULL, 0) ==
IS_LONG) {
- ulong key = (ulong) zend_atoi(Z_STRVAL_P(arg1),
Z_STRLEN_P(arg1));
+ ulong key = (ulong) zend_atol(Z_STRVAL_P(arg1),
Z_STRLEN_P(arg1));
if (zend_hash_index_find(Z_ARRVAL_P(arr), key,
(void **) &find_hash) == FAILURE) {
ALLOC_ZVAL(hash);
INIT_PZVAL(hash);
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.17&r2=1.640.2.23.2.57.2.18&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.17
php-src/main/main.c:1.640.2.23.2.57.2.18
--- php-src/main/main.c:1.640.2.23.2.57.2.17 Tue Mar 18 21:42:50 2008
+++ php-src/main/main.c Wed Mar 19 12:42:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.17 2008/03/18 21:42:50 rasmus Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.18 2008/03/19 12:42:16 tony2001 Exp $ */
/* {{{ includes
*/
@@ -118,7 +118,7 @@
static PHP_INI_MH(OnChangeMemoryLimit)
{
if (new_value) {
- PG(memory_limit) = zend_atoi(new_value, new_value_length);
+ PG(memory_limit) = zend_atol(new_value, new_value_length);
} else {
PG(memory_limit) = 1<<30; /* effectively, no
limit */
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
