cvs: pear /PEAR pear.c php_pear.h

dbeu Thu Aug 16 05:48:13 2001 EDT Modified files: /pear/PEAR pear.c php_pear.h Log: accomodate TSRM changes Index: pear/PEAR/pear.c diff -u pear/PEAR/pear.c:1.9 pear/PEAR/pear.c:1.10 --- pear/PEAR/pear.c:1.9 Mon May 28 07:15:38 2001 +++ pear/PEAR/pear.c Thu Aug 16 05:48:11 2001 @@ -104,8 +104,8 @@ 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); + pear_ptr = zend_register_internal_class(&pear TSRMLS_CC); + pear_error_ptr = zend_register_internal_class(&pear_error TSRMLS_CC); LONG_PROPERTY(pear_ptr, tmp, "_debug", 0); NULL_PROPERTY(pear_ptr, tmp, "_default_error_mode"); @@ -147,7 +147,7 @@ /* {{{ _call_destructors() */ static void -_call_destructors(void *data) +_call_destructors(void *data TSRMLS_DC) { zval *object = (zval *)data, *funcname, *retval; int res; @@ -160,7 +160,7 @@ memcpy(&funcname->value.str.val[1], object->value.obj.ce->name, funcname->value.str.len); funcname->value.str.val[funcname->value.str.len] = '\0'; - res = call_user_function_ex(&object->value.obj.ce->function_table, &object, funcname, &retval, 0, NULL, 1, NULL); + res = call_user_function_ex(&object->value.obj.ce->function_table, &object, funcname, &retval, 0, NULL, 1, NULL TSRMLS_CC); if (res == FAILURE) { php_error(E_WARNING, "calling %s::%s destructor failed!", object->value.obj.ce->name, funcname->value.str.val); @@ -175,7 +175,6 @@ /* Remove if there's nothing to do at request start */ PHP_RINIT_FUNCTION(pear) { - PEARLS_FETCH(); zend_llist_init(&PEARG(destructor_objects), sizeof(zval), NULL, 0); return SUCCESS; } @@ -186,8 +185,7 @@ /* Remove if there's nothing to do at request end */ PHP_RSHUTDOWN_FUNCTION(pear) { - PEARLS_FETCH(); - zend_llist_apply(&PEARG(destructor_objects), _call_destructors); + zend_llist_apply(&PEARG(destructor_objects), _call_destructors TSRMLS_CC); zend_llist_destroy(&PEARG(destructor_objects)); return SUCCESS; } @@ -199,7 +197,7 @@ PHP_MINFO_FUNCTION(pear) { php_info_print_table_start(); - php_info_print_table_header(2, "PEAR", " $Revision: 1.9 $"); + php_info_print_table_header(2, "PEAR", " $Revision: 1.10 $"); php_info_print_table_end(); /* DISPLAY_INI_ENTRIES(); */ @@ -216,7 +214,6 @@ zval *this = getThis(); size_t len; char *dtorfunc; - PEARLS_FETCH(); if (ZEND_NUM_ARGS() > 0) { WRONG_PARAM_COUNT; @@ -461,7 +458,7 @@ } MAKE_STD_ZVAL(ctor); ZVAL_STRING(ctor, "pear_error", 1); - res = call_user_function_ex(&return_value->value.obj.ce->function_table, &return_value, ctor, &retval, 5, args, 1, NULL); + res = call_user_function_ex(&return_value->value.obj.ce->function_table, &return_value, ctor, &retval, 5, args, 1, NULL TSRMLS_CC); if (res == FAILURE) { php_error(E_WARNING, "PEAR::raiseError: calling PEAR_Error constructor failed!"); zval_dtor(ctor); @@ -636,7 +633,7 @@ if (zend_is_callable(*options, 1, NULL)) { zval *retval, **args[1]; args[0] = &this; - if (call_user_function_ex(EG(function_table), NULL, *options, &retval, 1, args, 1, NULL) == FAILURE) { + if (call_user_function_ex(EG(function_table), NULL, *options, &retval, 1, args, 1, NULL TSRMLS_CC) == FAILURE) { php_error(E_WARNING, "PEAR_Error failed to invoke callback"); } } Index: pear/PEAR/php_pear.h diff -u pear/PEAR/php_pear.h:1.4 pear/PEAR/php_pear.h:1.5 --- pear/PEAR/php_pear.h:1.4 Mon Apr 30 12:26:57 2001 +++ pear/PEAR/php_pear.h Thu Aug 16 05:48:12 2001 @@ -118,11 +118,9 @@ */ #ifdef ZTS -#define PEARG(v) (pear_globals->v) -#define PEARLS_FETCH() zend_pear_globals *pear_globals = ts_resource(pear_globals_id) +#define PEARG(v) TSRMG(pear_globals_id, zend_pear_globals *, v) #else #define PEARG(v) (pear_globals.v) -#define PEARLS_FETCH() #endif #endif /* PHP_PEAR_H */