cvs: pear /PEAR pear.c

dbeu Wed May 2 12:28:00 2001 EDT Modified files: /pear/PEAR pear.c Log: just a bit cleaning # i'd like to use tab's tough :) Index: pear/PEAR/pear.c diff -u pear/PEAR/pear.c:1.7 pear/PEAR/pear.c:1.8 --- pear/PEAR/pear.c:1.7 Tue May 1 15:21:11 2001 +++ pear/PEAR/pear.c Wed May 2 12:27:59 2001 @@ -96,31 +96,21 @@ { zend_class_entry pear, pear_error; zval *tmp; -/* REGISTER_INI_ENTRIES();*/ #if ZTS ZEND_INIT_MODULE_GLOBALS(pear, NULL, NULL); #endif - pear.name = strdup("pear"); - pear.name_length = 4; - pear.builtin_functions = php_class_functions_pear; - pear.handle_function_call = NULL; - pear.handle_property_get = NULL; - pear.handle_property_set = NULL; - pear_ptr = zend_register_internal_class(&pear); + INIT_CLASS_ENTRY(pear, "pear", php_class_functions_pear); + INIT_CLASS_ENTRY(pear_error, "pear_error", php_class_functions_pear_error); + pear_ptr = zend_register_internal_class(&pear); + pear_error_ptr = zend_register_internal_class(&pear_error); + LONG_PROPERTY(pear_ptr, tmp, "_debug", 0); NULL_PROPERTY(pear_ptr, tmp, "_default_error_mode"); NULL_PROPERTY(pear_ptr, tmp, "_default_error_options"); NULL_PROPERTY(pear_ptr, tmp, "_default_error_handler"); - pear_error.name = strdup("pear_error"); - pear_error.name_length = 10; - pear_error.builtin_functions = php_class_functions_pear_error; - pear_error.handle_function_call = NULL; - pear_error.handle_property_get = NULL; - pear_error.handle_property_set = NULL; - pear_error_ptr = zend_register_internal_class(&pear_error); EMPTY_STRING_PROPERTY(pear_error_ptr, tmp, "message"); LONG_PROPERTY(pear_error_ptr, tmp, "code", -1); LONG_PROPERTY(pear_error_ptr, tmp, "mode", PEAR_ERROR_RETURN); @@ -153,17 +143,6 @@ /* }}} */ -/* {{{ _destructor_objects_dtor() */ - -static void -_destructor_objects_dtor(void *data) -{ - zval *object = (zval *)data; - /*ZVAL_DELREF(object);*/ - /*zval_dtor(object);*/ -} - -/* }}} */ /* {{{ _call_destructors() */ static void @@ -185,8 +164,7 @@ php_error(E_WARNING, "calling %s::%s destructor failed!", object->value.obj.ce->name, funcname->value.str.val); } - zval_dtor(funcname); - efree(funcname); + FREE_ZVAL(funcname); } /* }}} */ @@ -196,9 +174,9 @@ /* Remove if there's nothing to do at request start */ PHP_RINIT_FUNCTION(pear) { - PEARLS_FETCH(); - zend_llist_init(&PEARG(destructor_objects), sizeof(zval), _destructor_objects_dtor, 0); - return SUCCESS; + PEARLS_FETCH(); + zend_llist_init(&PEARG(destructor_objects), sizeof(zval), NULL, 0); + return SUCCESS; } /* }}} */ @@ -207,11 +185,10 @@ /* Remove if there's nothing to do at request end */ PHP_RSHUTDOWN_FUNCTION(pear) { - PEARLS_FETCH(); + PEARLS_FETCH(); zend_llist_apply(&PEARG(destructor_objects), _call_destructors); zend_llist_destroy(&PEARG(destructor_objects)); - - return SUCCESS; + return SUCCESS; } /* }}} */ @@ -221,7 +198,7 @@ PHP_MINFO_FUNCTION(pear) { php_info_print_table_start(); - php_info_print_table_header(2, "PEAR", " $Revision: 1.7 $"); + php_info_print_table_header(2, "PEAR", " $Revision: 1.8 $"); php_info_print_table_end(); /* DISPLAY_INI_ENTRIES(); */