[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /main main.c

[Antony Dovgal]

tony2001                Wed Mar 19 12:40:48 2008 UTC

  Modified files:              
    /php-src/ext/standard       basic_functions.c 
    /php-src/main       main.c 
  Log:
  make use of zend_atol()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.890&r2=1.891&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.890 
php-src/ext/standard/basic_functions.c:1.891
--- php-src/ext/standard/basic_functions.c:1.890        Thu Feb 28 14:16:14 2008
+++ php-src/ext/standard/basic_functions.c      Wed Mar 19 12:40:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.890 2008/02/28 14:16:14 felipe Exp $ */
+/* $Id: basic_functions.c,v 1.891 2008/03/19 12:40:48 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -6197,7 +6197,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.764&r2=1.765&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.764 php-src/main/main.c:1.765
--- php-src/main/main.c:1.764   Wed Mar 12 20:53:04 2008
+++ php-src/main/main.c Wed Mar 19 12:40:48 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.764 2008/03/12 20:53:04 stas Exp $ */
+/* $Id: main.c,v 1.765 2008/03/19 12:40:48 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