archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Renamed several internal functions for consistency

Browse source
This commit is contained in:
Moriyoshi Koizumi 2002-11-25 17:20:20 +00:00
parent b3cfda6389
commit 76b218cb6e
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ext/mbstring/mbstring.c
View file

@ -80,6 +80,11 @@
#endif #endif
/* }}} */ /* }}} */
/* {{{ prototypes */
static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC);
static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC);
/* }}} */
/* {{{ php_mb_default_identify_list[] */ /* {{{ php_mb_default_identify_list[] */
#if defined(HAVE_MBSTR_JA) #if defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = { static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
@ -680,8 +685,7 @@ PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ module global initialize handler */ /* {{{ module global initialize handler */
static void static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
php_mb_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC)
{ {
MBSTRG(language) = mbfl_no_language_uni; MBSTRG(language) = mbfl_no_language_uni;
MBSTRG(current_language) = MBSTRG(language); MBSTRG(current_language) = MBSTRG(language);
@ -712,17 +716,16 @@ php_mb_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC)
MBSTRG(encoding_translation) = 0; MBSTRG(encoding_translation) = 0;
pglobals->outconv = NULL; pglobals->outconv = NULL;
#if HAVE_MBREGEX #if HAVE_MBREGEX
php_mb_regex_globals_ctor(pglobals TSRMLS_CC); _php_mb_regex_globals_ctor(pglobals TSRMLS_CC);
#endif #endif
} }
/* }}} */ /* }}} */
/* {{{ static void mbstring_globals_dtor() */ /* {{{ static void mbstring_globals_dtor() */
static void static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
mbstring_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{ {
#if HAVE_MBREGEX #if HAVE_MBREGEX
php_mb_regex_globals_dtor(pglobals TSRMLS_CC); _php_mb_regex_globals_dtor(pglobals TSRMLS_CC);
#endif #endif
} }
/* }}} */ /* }}} */
@ -732,10 +735,10 @@ PHP_MINIT_FUNCTION(mbstring)
{ {
#ifdef ZTS #ifdef ZTS
ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals), ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals),
(ts_allocate_ctor) php_mb_init_globals, (ts_allocate_ctor) _php_mb_globals_ctor,
(ts_allocate_dtor) mbstring_globals_dtor); (ts_allocate_dtor) _php_mb_globals_dtor);
#else #else
php_mb_init_globals(&mbstring_globals TSRMLS_CC); _php_mb_globals_ctor(&mbstring_globals TSRMLS_CC);
#endif #endif
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
@ -787,7 +790,7 @@ PHP_MSHUTDOWN_FUNCTION(mbstring)
#ifdef ZTS #ifdef ZTS
ts_free_id(mbstring_globals_id); ts_free_id(mbstring_globals_id);
#else #else
mbstring_globals_dtor(&mbstring_globals TSRMLS_CC); _php_mb_globals_dtor(&mbstring_globals TSRMLS_CC);
#endif #endif
return SUCCESS; return SUCCESS;

8
ext/mbstring/php_mbregex.c
View file

@ -91,8 +91,8 @@ static void php_mb_regex_free_cache(mb_regex_t *pre)
} }
/* }}} */ /* }}} */
/* {{{ php_mb_regex_globals_ctor */ /* {{{ _php_mb_regex_globals_ctor */
void php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC) void _php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
{ {
MBSTRG(default_mbctype) = MBCTYPE_EUC; MBSTRG(default_mbctype) = MBCTYPE_EUC;
MBSTRG(current_mbctype) = MBCTYPE_EUC; MBSTRG(current_mbctype) = MBCTYPE_EUC;
@ -105,8 +105,8 @@ void php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
} }
/* }}} */ /* }}} */
/* {{{ php_mb_regex_globals_dtor */ /* {{{ _php_mb_regex_globals_dtor */
void php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC) void _php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{ {
zend_hash_destroy(&MBSTRG(ht_rc)); zend_hash_destroy(&MBSTRG(ht_rc));
} }

4
ext/mbstring/php_mbregex.h
View file

@ -85,8 +85,8 @@ PHP_MINIT_FUNCTION(mb_regex);
PHP_MSHUTDOWN_FUNCTION(mb_regex); PHP_MSHUTDOWN_FUNCTION(mb_regex);
PHP_RINIT_FUNCTION(mb_regex); PHP_RINIT_FUNCTION(mb_regex);
PHP_RSHUTDOWN_FUNCTION(mb_regex); PHP_RSHUTDOWN_FUNCTION(mb_regex);
void php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); void _php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
void php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC); void _php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
PHP_FUNCTION(mb_regex_encoding); PHP_FUNCTION(mb_regex_encoding);
PHP_FUNCTION(mb_ereg); PHP_FUNCTION(mb_ereg);