Re: cvs: php-src /ext/spl spl_iterators.c /ext/spl/tests array_004.phpt array_006.phpt array_008.phpt
| From: | Marcus Boerger | Date: | Sun, 25 Dec 2005 16:24:02 +0000 |
| Subject: | Re: cvs: php-src /ext/spl spl_iterators.c /ext/spl/tests array_004.phpt array_006.phpt array_008.phpt | ||
| References: | 1 2 3 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-36218@lists.php.net to get a copy of this message | ||
Hello Jani,
though what you said is also true, i can nolonger easily get rid of those
inline definitions for debugging purpose.
marcus
Sunday, December 25, 2005, 5:15:35 PM, you wrote:
> It was wrong since you can safely use inline anywhere.
> It's checked elsewhere and re-defined for each OS/compiler
> properly. You're not supposed to create such macros yourself.
> --Jani
> On Sun, 25 Dec 2005, Marcus Boerger wrote:
>>
>> Hello Jani,
>>
>> ahhhh, jani there was no wrong inline usage, just stupid compilers
>> ignoring the specs, and the way to fix it is to find the places where
>> an inline function is used as a non inline function and prodive a non
>> inline wrapper for it. Which is probably only one single instance.
>>
>> regards
>> marcus
>>
>> Sunday, December 25, 2005, 5:03:38 PM, you wrote:
>>
>>> sniper Sun Dec 25 16:03:38 2005 EDT
>>
>>> Modified files:
>>> /php-src/ext/spl spl_iterators.c
>>> /php-src/ext/spl/tests array_004.phpt array_006.phpt array_008.phpt
>>> Log:
>>> - Remove wrong inline usage (and fix bug #35796)
>>>
>>>
>>> http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.104&r2=1.105&diff_format=u
>>> Index: php-src/ext/spl/spl_iterators.c
>>> diff -u php-src/ext/spl/spl_iterators.c:1.104
>>> php-src/ext/spl/spl_iterators.c:1.105
>>> --- php-src/ext/spl/spl_iterators.c:1.104 Thu Dec 22 00:38:05 2005
>>> +++ php-src/ext/spl/spl_iterators.c Sun Dec 25 16:03:38 2005
>>> @@ -16,7 +16,7 @@
>>> +----------------------------------------------------------------------+
>>> */
>>>
>>> -/* $Id: spl_iterators.c,v 1.104 2005/12/22 00:38:05 helly Exp $ */
>>> +/* $Id: spl_iterators.c,v 1.105 2005/12/25 16:03:38 sniper Exp $ */
>>>
>>> #ifdef HAVE_CONFIG_H
>>> # include "config.h"
>>> @@ -36,8 +36,6 @@
>>> #include "spl_array.h"
>>> #include "spl_exceptions.h"
>>>
>>> -#define INLINE inline
>>> -
>>> PHPAPI zend_class_entry *spl_ce_RecursiveIterator;
>>> PHPAPI zend_class_entry *spl_ce_RecursiveIteratorIterator;
>>> PHPAPI zend_class_entry *spl_ce_FilterIterator;
>>> @@ -831,9 +829,9 @@
>>> }
>>> #endif
>>>
>>> -static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more
>>> TSRMLS_DC);
>>> +static inline int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more
>>> TSRMLS_DC);
>>>
>>> -static INLINE spl_dual_it_object*
>>> spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_inner,
>>> dual_it_type dit_type)
>>> +static inline spl_dual_it_object*
>>> spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_inner,
>>> dual_it_type dit_type)
>>> {
>>> zval *zobject, *retval;
>>> spl_dual_it_object *intern;
>>> @@ -990,14 +988,14 @@
>>> }
>>> } /* }}} */
>>>
>>> -static INLINE void spl_dual_it_require(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline void spl_dual_it_require(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> if (!intern->inner.iterator) {
>>> php_error_docref(NULL TSRMLS_CC, E_ERROR, "The inner
>>> constructor wasn't initialized with an iterator instance");
>>> }
>>> }
>>>
>>> -static INLINE void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> if (intern->inner.iterator &&
>>> intern->inner.iterator->funcs->invalidate_current) {
>>>
>>> intern->inner.iterator->funcs->invalidate_current(intern->inner.iterator
>>> TSRMLS_CC);
>>> @@ -1022,7 +1020,7 @@
>>> }
>>> }
>>>
>>> -static INLINE void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> spl_dual_it_free(intern TSRMLS_CC);
>>> intern->current.pos = 0;
>>> @@ -1031,13 +1029,13 @@
>>> }
>>> }
>>>
>>> -static INLINE int spl_dual_it_valid(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline int spl_dual_it_valid(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> /* FAILURE / SUCCESS */
>>> return
>>> intern->inner.iterator->funcs->valid(intern->inner.iterator TSRMLS_CC);
>>> }
>>>
>>> -static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more
>>> TSRMLS_DC)
>>> +static inline int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more
>>> TSRMLS_DC)
>>> {
>>> zval **data;
>>>
>>> @@ -1057,7 +1055,7 @@
>>> return FAILURE;
>>> }
>>>
>>> -static INLINE void spl_dual_it_next(spl_dual_it_object *intern, int do_free TSRMLS_DC)
>>> +static inline void spl_dual_it_next(spl_dual_it_object *intern, int do_free TSRMLS_DC)
>>> {
>>> if (do_free) {
>>> spl_dual_it_free(intern TSRMLS_CC);
>>> @@ -1158,7 +1156,7 @@
>>> spl_dual_it_fetch(intern, 1 TSRMLS_CC);
>>> } /* }}} */
>>>
>>> -static INLINE void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern
>>> TSRMLS_DC)
>>> +static inline void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern
>>> TSRMLS_DC)
>>> {
>>> zval *retval;
>>>
>>> @@ -1177,13 +1175,13 @@
>>> spl_dual_it_free(intern TSRMLS_CC);
>>> }
>>>
>>> -static INLINE void spl_filter_it_rewind(zval *zthis, spl_dual_it_object *intern
>>> TSRMLS_DC)
>>> +static inline void spl_filter_it_rewind(zval *zthis, spl_dual_it_object *intern
>>> TSRMLS_DC)
>>> {
>>> spl_dual_it_rewind(intern TSRMLS_CC);
>>> spl_filter_it_fetch(zthis, intern TSRMLS_CC);
>>> }
>>>
>>> -static INLINE void spl_filter_it_next(zval *zthis, spl_dual_it_object *intern
>>> TSRMLS_DC)
>>> +static inline void spl_filter_it_next(zval *zthis, spl_dual_it_object *intern
>>> TSRMLS_DC)
>>> {
>>> spl_dual_it_next(intern, 1 TSRMLS_CC);
>>> spl_filter_it_fetch(zthis, intern TSRMLS_CC);
>>> @@ -1336,7 +1334,7 @@
>>> #endif
>>>
>>> /* {{{ spl_dual_it_free_storage */
>>> -static INLINE void spl_dual_it_free_storage(void *_object TSRMLS_DC)
>>> +static inline void spl_dual_it_free_storage(void *_object TSRMLS_DC)
>>> {
>>> spl_dual_it_object *object = (spl_dual_it_object *)_object;
>>>
>>> @@ -1458,7 +1456,7 @@
>>> };
>>> #endif
>>>
>>> -static INLINE int spl_limit_it_valid(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline int spl_limit_it_valid(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> /* FAILURE / SUCCESS */
>>> if (intern->u.limit.count != -1 && intern->current.pos >=
>>> intern->u.limit.offset + intern->u.limit.count) {
>>> @@ -1468,7 +1466,7 @@
>>> }
>>> }
>>>
>>> -static INLINE void spl_limit_it_seek(spl_dual_it_object *intern, long pos TSRMLS_DC)
>>> +static inline void spl_limit_it_seek(spl_dual_it_object *intern, long pos TSRMLS_DC)
>>> {
>>> zval *zpos;
>>>
>>> @@ -1610,17 +1608,17 @@
>>> {NULL, NULL, NULL}
>>> };
>>>
>>> -static INLINE int spl_caching_it_valid(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline int spl_caching_it_valid(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> return intern->u.caching.flags & CIT_VALID ? SUCCESS : FAILURE;
>>> }
>>>
>>> -static INLINE int spl_caching_it_has_next(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline int spl_caching_it_has_next(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> return spl_dual_it_valid(intern TSRMLS_CC);
>>> }
>>>
>>> -static INLINE void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> if (spl_dual_it_fetch(intern, 1 TSRMLS_CC) == SUCCESS) {
>>> intern->u.caching.flags |= CIT_VALID;
>>> @@ -1678,7 +1676,7 @@
>>> }
>>> }
>>>
>>> -static INLINE void spl_caching_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
>>> +static inline void spl_caching_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
>>> {
>>> spl_dual_it_rewind(intern TSRMLS_CC);
>>> zend_hash_clean(HASH_OF(intern->u.caching.zcache));
>>>
>>> http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/array_004.phpt?r1=1.4&r2=1.5&diff_format=u
>>> Index: php-src/ext/spl/tests/array_004.phpt
>>> diff -u php-src/ext/spl/tests/array_004.phpt:1.4
>>> php-src/ext/spl/tests/array_004.phpt:1.5
>>> --- php-src/ext/spl/tests/array_004.phpt:1.4 Tue Apr 27 15:48:20 2004
>>> +++ php-src/ext/spl/tests/array_004.phpt Sun Dec 25 16:03:38 2005
>>> @@ -3,7 +3,7 @@
>>> --SKIPIF--
>>> <?php if (!extension_loaded("spl")) print "skip"; ?>
>>> --INI--
>>> -allow_call_time_pass_reference=1
>>> +error_reporting=2047
>>> --FILE--
>>> <?php
>>>
>>>
>>> http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/array_006.phpt?r1=1.1&r2=1.2&diff_format=u
>>> Index: php-src/ext/spl/tests/array_006.phpt
>>> diff -u php-src/ext/spl/tests/array_006.phpt:1.1
>>> php-src/ext/spl/tests/array_006.phpt:1.2
>>> --- php-src/ext/spl/tests/array_006.phpt:1.1 Sun Apr 25 11:14:11 2004
>>> +++ php-src/ext/spl/tests/array_006.phpt Sun Dec 25 16:03:38 2005
>>> @@ -3,7 +3,7 @@
>>> --SKIPIF--
>>> <?php if (!extension_loaded("spl")) print "skip"; ?>
>>> --INI--
>>> -allow_call_time_pass_reference=1
>>> +error_reporting=2047
>>> --FILE--
>>> <?php
>>>
>>>
>>> http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/array_008.phpt?r1=1.1&r2=1.2&diff_format=u
>>> Index: php-src/ext/spl/tests/array_008.phpt
>>> diff -u php-src/ext/spl/tests/array_008.phpt:1.1
>>> php-src/ext/spl/tests/array_008.phpt:1.2
>>> --- php-src/ext/spl/tests/array_008.phpt:1.1 Sun Apr 25 11:14:11 2004
>>> +++ php-src/ext/spl/tests/array_008.phpt Sun Dec 25 16:03:38 2005
>>> @@ -3,7 +3,7 @@
>>> --SKIPIF--
>>> <?php if (!extension_loaded("spl")) print "skip"; ?>
>>> --INI--
>>> -allow_call_time_pass_reference=1
>>> +error_reporting=2047
>>> --FILE--
>>> <?php