tony2001                Mon Feb 11 13:34:26 2008 UTC

  Modified files:              
    /php-src/ext/standard       array.c 
  Log:
  this is integer, not pointer
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.441&r2=1.442&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.441 php-src/ext/standard/array.c:1.442
--- php-src/ext/standard/array.c:1.441  Tue Feb  5 16:02:23 2008
+++ php-src/ext/standard/array.c        Mon Feb 11 13:34:26 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.441 2008/02/05 16:02:23 iliaa Exp $ */
+/* $Id: array.c,v 1.442 2008/02/11 13:34:26 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -2296,7 +2296,7 @@
        zval     *input,                /* Input array */
                        **entry;                /* An array entry */
        long     offset,                /* Offset to get elements from */
-                        length = NULL;
+                        length = 0;
        zend_bool preserve_keys = 0; /* Whether to preserve keys while copying 
to the new array or not */
        int              num_in,                /* Number of elements in the 
input array */
                         pos;                   /* Current position in the 
array */
@@ -2313,7 +2313,7 @@
        num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
 
        /* We want all entries from offset to the end if length is not passed 
or length is null */
-       if (length == NULL) {
+       if (length == 0) {
                length = num_in;
        }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to