cvs: ZendEngine2 / zend_list.c zend_list.h

sterling Wed Apr 2 22:07:58 2003 EDT Modified files: /ZendEngine2 zend_list.c zend_list.h Log: i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 i will not commit before 12:00 Index: ZendEngine2/zend_list.c diff -u ZendEngine2/zend_list.c:1.59 ZendEngine2/zend_list.c:1.60 --- ZendEngine2/zend_list.c:1.59 Wed Apr 2 12:23:04 2003 +++ ZendEngine2/zend_list.c Wed Apr 2 22:07:57 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_list.c,v 1.59 2003/04/02 17:23:04 derick Exp $ */ +/* $Id: zend_list.c,v 1.60 2003/04/03 03:07:57 sterling Exp $ */ /* resource lists */ @@ -79,22 +79,6 @@ } } -ZEND_API int zend_list_id_by_pointer(void *p, int type TSRMLS_DC) -{ - zend_rsrc_list_entry *le; - HashPosition pos; - - for (zend_hash_internal_pointer_reset_ex(&EG(regular_list), &pos); - zend_hash_get_current_data_ex(&EG(regular_list), (void *) &le, &pos) == SUCCESS; - zend_hash_move_forward_ex(&EG(regular_list), &pos)) { - if (le->type == type && le->ptr == p) { - return le->id; - } - } - - return -1; -} - ZEND_API int _zend_list_addref(int id TSRMLS_DC) { zend_rsrc_list_entry *le; Index: ZendEngine2/zend_list.h diff -u ZendEngine2/zend_list.h:1.43 ZendEngine2/zend_list.h:1.44 --- ZendEngine2/zend_list.h:1.43 Wed Apr 2 11:58:52 2003 +++ ZendEngine2/zend_list.h Wed Apr 2 22:07:58 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_list.h,v 1.43 2003/04/02 16:58:52 sterling Exp $ */ +/* $Id: zend_list.h,v 1.44 2003/04/03 03:07:58 sterling Exp $ */ #ifndef ZEND_LIST_H #define ZEND_LIST_H @@ -34,7 +34,6 @@ void *ptr; int type; int refcount; - int id; } zend_rsrc_list_entry; typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc TSRMLS_DC); @@ -75,7 +74,6 @@ ZEND_API int _zend_list_addref(int id TSRMLS_DC); ZEND_API int _zend_list_delete(int id TSRMLS_DC); ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC); -ZEND_API int zend_list_id_by_pointer(void *p, int type TSRMLS_DC); #define zend_list_addref(id) _zend_list_addref(id TSRMLS_CC) #define zend_list_delete(id) _zend_list_delete(id TSRMLS_CC)