Re[2]: [PHP-CVS] cvs: spl / spl_foreach.c

Hello Jason, Wednesday, July 9, 2003, 4:57:19 AM, you wrote: JG> Actually, I double checked C99, and // was added, however C89 does not. JG> -Jason JG> On Tue, 2003-07-08 at 21:48, Jason Greene wrote: >> jason Tue Jul 8 22:48:25 2003 EDT >> >> Modified files: >> /spl spl_foreach.c >> Log: >> Convert C++ comments to C (violates C99, and breaks several compilers) >> >> >> Index: spl/spl_foreach.c >> diff -u spl/spl_foreach.c:1.15 spl/spl_foreach.c:1.16 >> --- spl/spl_foreach.c:1.15 Tue Jul 8 19:11:14 2003 >> +++ spl/spl_foreach.c Tue Jul 8 22:48:25 2003 >> @@ -151,10 +151,10 @@ >> if (proxy->is_a & SPL_IS_A_SEQUENCE) { >> spl_begin_method_call_no_retval(obj, proxy->obj_ce, >> &proxy->funcs.rewind, "rewind", sizeof("rewind")-1 TSRMLS_CC); >> } >> - // now this is an optimization trick: >> - // ZEND_SWITCH_FREE receives the array copy or the spl object in op1 >> and has an unused op2 >> - // We have to check for op1 being an object that implements >> spl_forwar... Or we simply set >> - // op2 and know we can safely free the object as needed, which is >> waht we do. >> + /* now this is an optimization trick: >> + ZEND_SWITCH_FREE receives the array copy or the spl object in op1 >> and has an unused op2 >> + We have to check for op1 being an object that implements >> spl_forwar... Or we simply set >> + op2 and know we can safely free the object as needed, which is >> waht we do. */ >> op_array->opcodes[EX(opline)->op2.u.opline_num].op2 = *op1; >> } >> >> @@ -242,7 +242,7 @@ >> /* {{{ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE) */ >> ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE) >> { >> - // See not in ZEND_FE_FETCH on setting op2 >> + /* See not in ZEND_FE_FETCH on setting op2 */ >> znode *op2 = &EX(opline)->op2; >> zval *tmp, **obj = spl_get_zval_ptr_ptr(op2, EX(Ts) TSRMLS_CC); >> spl_foreach_proxy *proxy; JG> -- JG> Jason Greene <jason@inetgurus.net> JG> <jason@php.net> JG> Children's talent to endure stems from their ignorance of alternatives. JG> -- Maya Angelou, "I Know Why the Caged Bird Sings" Sure & thanks! I forgot to change that.... -- Best regards, Marcus mailto:helly@php.net