helly Mon Dec 17 13:47:09 2007 UTC Modified files: /php-src/ext/spl spl_array.c Log: - Fix folding (again) - Fix clone mask http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.134&r2=1.135&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.134 php-src/ext/spl/spl_array.c:1.135 --- php-src/ext/spl/spl_array.c:1.134 Sat Dec 15 01:18:28 2007 +++ php-src/ext/spl/spl_array.c Mon Dec 17 13:47:09 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.134 2007/12/15 01:18:28 davidc Exp $ */ +/* $Id: spl_array.c,v 1.135 2007/12/17 13:47:09 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -56,7 +56,7 @@ #define SPL_ARRAY_IS_SELF 0x02000000 #define SPL_ARRAY_USE_OTHER 0x04000000 #define SPL_ARRAY_INT_MASK 0xFFFF0000 -#define SPL_ARRAY_CLONE_MASK 0x030FFFFF +#define SPL_ARRAY_CLONE_MASK 0x0300FFFF typedef struct _spl_array_object { zend_object std; @@ -777,7 +777,7 @@ efree(iterator); } /* }}} */ - + static int spl_array_it_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ { spl_array_it *iterator = (spl_array_it *)iter; @@ -1230,38 +1230,37 @@ SPL_METHOD(cname, fname) \ { \ spl_array_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, #fname, sizeof(#fname)-1, use_arg); \ -} +} /* }}} */ -/* proto int ArrayObject::asort() U +/* {{{ proto int ArrayObject::asort() U proto int ArrayIterator::asort() U Sort the entries by values. */ -SPL_ARRAY_METHOD(Array, asort, 0) +SPL_ARRAY_METHOD(Array, asort, 0) /* }}} */ -/* proto int ArrayObject::ksort() U +/* {{{ proto int ArrayObject::ksort() U proto int ArrayIterator::ksort() U Sort the entries by key. */ -SPL_ARRAY_METHOD(Array, ksort, 0) +SPL_ARRAY_METHOD(Array, ksort, 0) /* }}} */ -/* proto int ArrayObject::uasort(callback cmp_function) U +/* {{{ proto int ArrayObject::uasort(callback cmp_function) U proto int ArrayIterator::uasort(callback cmp_function) U Sort the entries by values user defined function. */ -SPL_ARRAY_METHOD(Array, uasort, 1) +SPL_ARRAY_METHOD(Array, uasort, 1) /* }}} */ -/* proto int ArrayObject::uksort(callback cmp_function) U +/* {{{ proto int ArrayObject::uksort(callback cmp_function) U proto int ArrayIterator::uksort(callback cmp_function) U Sort the entries by key using user defined function. */ -SPL_ARRAY_METHOD(Array, uksort, 1) +SPL_ARRAY_METHOD(Array, uksort, 1) /* }}} */ -/* proto int ArrayObject::natsort() U +/* {{{ proto int ArrayObject::natsort() U proto int ArrayIterator::natsort() U Sort the entries by values using "natural order" algorithm. */ -SPL_ARRAY_METHOD(Array, natsort, 0) +SPL_ARRAY_METHOD(Array, natsort, 0) /* }}} */ -/* proto int ArrayObject::natcasesort() U +/* {{{ proto int ArrayObject::natcasesort() U proto int ArrayIterator::natcasesort() U Sort the entries by key using case insensitive "natural order" algorithm. */ -SPL_ARRAY_METHOD(Array, natcasesort, 0) -/* }}} */ +SPL_ARRAY_METHOD(Array, natcasesort, 0) /* }}} */ /* {{{ proto mixed|NULL ArrayIterator::current() U Return current array entry */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php