moriyoshi Wed Oct 23 12:54:31 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c mbstring.h
/php4/main rfc1867.c
Log:
Remaned the functions for consistency
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.112 php4/ext/mbstring/mbstring.c:1.113
--- php4/ext/mbstring/mbstring.c:1.112 Wed Oct 23 12:48:33 2002
+++ php4/ext/mbstring/mbstring.c Wed Oct 23 12:54:29 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.112 2002/10/23 16:48:33 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.113 2002/10/23 16:54:29 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -1495,7 +1495,7 @@
return last;
}
-int mbstr_is_mb_leadbyte(const char *s TSRMLS_DC){
+PHPAPI int php_mb_is_mb_leadbyte(const char *s TSRMLS_DC){
unsigned char *p = (unsigned char *)s;
if (MBSTRG(current_language) == mbfl_no_language_japanese
&& IS_SJIS1(*p) && IS_SJIS2(*(p+1))){
@@ -3457,7 +3457,7 @@
}
/* }}} */
-PHPAPI int mbstr_encoding_translation(TSRMLS_D)
+PHPAPI int php_mb_encoding_translation(TSRMLS_D)
{
return MBSTRG(encoding_translation);
}
Index: php4/ext/mbstring/mbstring.h
diff -u php4/ext/mbstring/mbstring.h:1.34 php4/ext/mbstring/mbstring.h:1.35
--- php4/ext/mbstring/mbstring.h:1.34 Sun Oct 20 21:44:59 2002
+++ php4/ext/mbstring/mbstring.h Wed Oct 23 12:54:30 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.h,v 1.34 2002/10/21 01:44:59 moriyoshi Exp $ */
+/* $Id: mbstring.h,v 1.35 2002/10/23 16:54:30 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -110,8 +110,8 @@
PHP_FUNCTION(mb_get_info);
char *mbstr_strrchr(const char *s, char c TSRMLS_DC);
-int mbstr_is_mb_leadbyte(const char *s TSRMLS_DC);
-PHPAPI int mbstr_encoding_translation(TSRMLS_D);
+int php_mb_is_leadbyte(const char *s TSRMLS_DC);
+PHPAPI int php_mb_encoding_translation(TSRMLS_D);
ZEND_BEGIN_MODULE_GLOBALS(mbstring)
int language;
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.117 php4/main/rfc1867.c:1.118
--- php4/main/rfc1867.c:1.117 Mon Oct 7 07:23:24 2002
+++ php4/main/rfc1867.c Wed Oct 23 12:54:31 2002
@@ -16,7 +16,7 @@
| Jani Taskinen <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.117 2002/10/07 11:23:24 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.118 2002/10/23 16:54:31 moriyoshi Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -512,8 +512,8 @@
} else {
*resp++ = start[i];
#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
- if (mbstr_encoding_translation(TSRMLS_C) &&
- mbstr_is_mb_leadbyte(start+i TSRMLS_CC)) {
+ if (php_mb_encoding_translation(TSRMLS_C) &&
+ php_mb_is_mb_leadbyte(start+i TSRMLS_CC)) {
*resp++ = start[++i];
}
#endif
@@ -903,7 +903,7 @@
}
#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
- if (mbstr_encoding_translation(TSRMLS_C)) {
+ if (php_mb_encoding_translation(TSRMLS_C)) {
s = mbstr_strrchr(filename, '\\' TSRMLS_CC);
} else {
s = strrchr(filename, '\\');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
