diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-30 01:56:43 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-30 01:56:43 +0000 |
| commit | 1c25b8dd532961ecb09932b182457ca0adcf8b57 (patch) | |
| tree | 2996afec821096218156f1d914301ad589edf897 /ext/standard/basic_functions.c | |
| parent | b57703825be0ff40d34ee257ce14c453c4bffb98 (diff) | |
| download | php-git-1c25b8dd532961ecb09932b182457ca0adcf8b57.tar.gz | |
Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index aa04d039f4..4fc830ab01 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1879,7 +1879,7 @@ void php_call_shutdown_functions(void) TSRMLS_FETCH(); if (BG(user_shutdown_function_names)) zend_try { - zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t)user_shutdown_function_call); + zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) user_shutdown_function_call); memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); zend_hash_destroy(BG(user_shutdown_function_names)); efree(BG(user_shutdown_function_names)); @@ -1965,7 +1965,7 @@ PHP_FUNCTION(highlight_string) php_get_highlight_struct(&syntax_highlighter_ini); - hicompiled_string_description = zend_make_compiled_string_description("highlighted code"); + hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC); if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) { efree(hicompiled_string_description); @@ -2086,16 +2086,17 @@ void test_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_refere } -void test_class_startup() +void test_class_startup(void) { zend_class_entry test_class_entry; + TSRMLS_FETCH(); INIT_OVERLOADED_CLASS_ENTRY(test_class_entry, "OverloadedTestClass", NULL, test_class_call_function, test_class_get_property, test_class_set_property); - zend_register_internal_class(&test_class_entry); + zend_register_internal_class(&test_class_entry TSRMLS_CC); } /* {{{ proto string ini_get(string varname) |