cvs: php-src(PHP_5_3) /ext/standard array.c

tony2001 Mon Feb 11 13:34:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard array.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.20&r2=1.308.2.21.2.37.2.21&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.20 php-src/ext/standard/array.c:1.308.2.21.2.37.2.21 --- php-src/ext/standard/array.c:1.308.2.21.2.37.2.20 Tue Feb 5 15:58:27 2008 +++ php-src/ext/standard/array.c Mon Feb 11 13:34:41 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.308.2.21.2.37.2.20 2008/02/05 15:58:27 iliaa Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.37.2.21 2008/02/11 13:34:41 tony2001 Exp $ */ #include "php.h" #include "php_ini.h" @@ -2109,7 +2109,7 @@ zval *input, /* Input array */ **entry; /* An array entry */ long offset, /* Offset to get elements from */ - length = NULL; /* How many elements to get */ + length = 0; /* How many elements to get */ 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 */ @@ -2126,7 +2126,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 is null */ - if (length == NULL) { + if (length == 0) { length = num_in; }