moriyoshi Mon Nov 25 12:20:20 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c php_mbregex.c php_mbregex.h
Log:
Renamed several internal functions for consistency
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.150 php4/ext/mbstring/mbstring.c:1.151
--- php4/ext/mbstring/mbstring.c:1.150 Sat Nov 23 15:14:33 2002
+++ php4/ext/mbstring/mbstring.c Mon Nov 25 12:20:19 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.150 2002/11/23 20:14:33 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.151 2002/11/25 17:20:19 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -80,6 +80,11 @@
#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[] */
#if defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
@@ -680,8 +685,7 @@
/* }}} */
/* {{{ module global initialize handler */
-static void
-php_mb_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC)
+static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
MBSTRG(language) = mbfl_no_language_uni;
MBSTRG(current_language) = MBSTRG(language);
@@ -712,17 +716,16 @@
MBSTRG(encoding_translation) = 0;
pglobals->outconv = NULL;
#if HAVE_MBREGEX
- php_mb_regex_globals_ctor(pglobals TSRMLS_CC);
+ _php_mb_regex_globals_ctor(pglobals TSRMLS_CC);
#endif
}
/* }}} */
/* {{{ static void mbstring_globals_dtor() */
-static void
-mbstring_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
+static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
#if HAVE_MBREGEX
- php_mb_regex_globals_dtor(pglobals TSRMLS_CC);
+ _php_mb_regex_globals_dtor(pglobals TSRMLS_CC);
#endif
}
/* }}} */
@@ -732,10 +735,10 @@
{
#ifdef ZTS
ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals),
- (ts_allocate_ctor) php_mb_init_globals,
- (ts_allocate_dtor) mbstring_globals_dtor);
+ (ts_allocate_ctor) _php_mb_globals_ctor,
+ (ts_allocate_dtor) _php_mb_globals_dtor);
#else
- php_mb_init_globals(&mbstring_globals TSRMLS_CC);
+ _php_mb_globals_ctor(&mbstring_globals TSRMLS_CC);
#endif
REGISTER_INI_ENTRIES();
@@ -787,7 +790,7 @@
#ifdef ZTS
ts_free_id(mbstring_globals_id);
#else
- mbstring_globals_dtor(&mbstring_globals TSRMLS_CC);
+ _php_mb_globals_dtor(&mbstring_globals TSRMLS_CC);
#endif
return SUCCESS;
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.22 php4/ext/mbstring/php_mbregex.c:1.23
--- php4/ext/mbstring/php_mbregex.c:1.22 Sat Nov 23 15:14:33 2002
+++ php4/ext/mbstring/php_mbregex.c Mon Nov 25 12:20:19 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.22 2002/11/23 20:14:33 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.23 2002/11/25 17:20:19 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -91,8 +91,8 @@
}
/* }}} */
-/* {{{ php_mb_regex_globals_ctor */
-void php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
+/* {{{ _php_mb_regex_globals_ctor */
+void _php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
MBSTRG(default_mbctype) = MBCTYPE_EUC;
MBSTRG(current_mbctype) = MBCTYPE_EUC;
@@ -105,8 +105,8 @@
}
/* }}} */
-/* {{{ php_mb_regex_globals_dtor */
-void php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
+/* {{{ _php_mb_regex_globals_dtor */
+void _php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
zend_hash_destroy(&MBSTRG(ht_rc));
}
Index: php4/ext/mbstring/php_mbregex.h
diff -u php4/ext/mbstring/php_mbregex.h:1.4 php4/ext/mbstring/php_mbregex.h:1.5
--- php4/ext/mbstring/php_mbregex.h:1.4 Thu Nov 14 13:54:42 2002
+++ php4/ext/mbstring/php_mbregex.h Mon Nov 25 12:20:20 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.h,v 1.4 2002/11/14 18:54:42 moriyoshi Exp $ */
+/* $Id: php_mbregex.h,v 1.5 2002/11/25 17:20:20 moriyoshi Exp $ */
#ifndef _PHP_MBREGEX_H
#define _PHP_MBREGEX_H
@@ -85,8 +85,8 @@
PHP_MSHUTDOWN_FUNCTION(mb_regex);
PHP_RINIT_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_dtor(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);
PHP_FUNCTION(mb_regex_encoding);
PHP_FUNCTION(mb_ereg);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
