moriyoshi Wed Oct 23 15:51:50 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c mbstring.h
/php4/main rfc1867.c
Log:
Function renaming.
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.116 php4/ext/mbstring/mbstring.c:1.117
--- php4/ext/mbstring/mbstring.c:1.116 Wed Oct 23 15:38:46 2002
+++ php4/ext/mbstring/mbstring.c Wed Oct 23 15:51:48 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.116 2002/10/23 19:38:46 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.117 2002/10/23 19:51:48 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -498,7 +498,6 @@
/* }}} */
#endif
-
/* {{{ php.ini directive handler */
static PHP_INI_MH(OnUpdate_mbstring_language)
{
@@ -1019,7 +1018,6 @@
}
/* }}} */
-
/* {{{ proto string mb_language([string language])
Sets the current language or Returns the current language as a string */
PHP_FUNCTION(mb_language)
@@ -1051,8 +1049,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_internal_encoding([string encoding])
Sets the current internal encoding or Returns the current internal encoding as a
string */
PHP_FUNCTION(mb_internal_encoding)
@@ -1087,7 +1083,6 @@
}
/* }}} */
-
/* {{{ proto false|string mb_http_input([string type])
Returns the input encoding */
PHP_FUNCTION(mb_http_input)
@@ -1180,7 +1175,6 @@
}
/* }}} */
-
/* {{{ proto string mb_http_output([string encoding])
Sets the current output_encoding or returns the current output_encoding as a
string */
PHP_FUNCTION(mb_http_output)
@@ -1212,7 +1206,6 @@
}
/* }}} */
-
/* {{{ proto bool|array mb_detect_order([mixed encoding-list])
Sets the current detect_order or Return the current detect_order as a array */
PHP_FUNCTION(mb_detect_order)
@@ -1273,7 +1266,6 @@
}
/* }}} */
-
/* {{{ proto mixed mb_substitute_character([mixed substchar])
Sets the current substitute_character or returns the current substitute_character
*/
PHP_FUNCTION(mb_substitute_character)
@@ -1324,7 +1316,6 @@
}
/* }}} */
-
/* {{{ proto string mb_preferred_mime_name(string encoding)
Return the preferred MIME name (charset) as a string */
PHP_FUNCTION(mb_preferred_mime_name)
@@ -1519,8 +1510,8 @@
#define IS_SJIS1(c) ((((c)>=0x81 && (c)<=0x9f) || ((c)>=0xe0 && (c)<=0xf5)) ? 1 : 0)
#define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0)
-/* {{{ char *mbstr_strrchr() */
-char *mbstr_strrchr(const char *s, char c TSRMLS_DC){
+/* {{{ PHPAPI char *php_mb_strrchr() */
+PHPAPI char *php_mb_strrchr(const char *s, char c TSRMLS_DC){
unsigned char *p = (unsigned char *)s, *last = NULL;
while(*p++) {
if (*p == c) {
@@ -1852,8 +1843,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_output_handler(string contents, int status)
Returns string in output buffer converted to the http_output encoding */
PHP_FUNCTION(mb_output_handler)
@@ -1948,8 +1937,6 @@
}
/* }}} */
-
-
/* {{{ proto int mb_strlen(string str [, string encoding])
Get character numbers of a string */
PHP_FUNCTION(mb_strlen)
@@ -2000,8 +1987,6 @@
}
/* }}} */
-
-
/* {{{ proto int mb_strpos(string haystack, string needle [, int offset [, string
encoding]])
Find position of first occurrence of a string within another */
PHP_FUNCTION(mb_strpos)
@@ -2088,8 +2073,6 @@
}
/* }}} */
-
-
/* {{{ proto int mb_strrpos(string haystack, string needle [, string encoding])
Find the last occurrence of a character in a string within another */
PHP_FUNCTION(mb_strrpos)
@@ -2148,8 +2131,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_substr(string str, int start [, int length [, string
encoding]])
Returns part of a string */
PHP_FUNCTION(mb_substr)
@@ -2237,8 +2218,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_strcut(string str, int start [, int length [, string
encoding]])
Returns part of a string */
PHP_FUNCTION(mb_strcut)
@@ -2320,8 +2299,6 @@
}
/* }}} */
-
-
/* {{{ proto int mb_strwidth(string str [, string encoding])
Gets terminal width of a string */
PHP_FUNCTION(mb_strwidth)
@@ -2361,8 +2338,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_strimwidth(string str, int start, int width [, string
trimmarker [, string encoding]])
Trim the string in terminal width */
PHP_FUNCTION(mb_strimwidth)
@@ -2525,8 +2500,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_convert_encoding(string str, string to-encoding [, mixed
from-encoding])
Returns converted string in desired encoding */
PHP_FUNCTION(mb_convert_encoding)
@@ -2602,7 +2575,6 @@
}
/* }}} */
-
/* {{{ proto string mb_convert_case(string sourcestring, int mode [, string encoding])
Returns a case-folded version of sourcestring */
PHP_FUNCTION(mb_convert_case)
@@ -2674,7 +2646,6 @@
}
/* }}} */
-
/* {{{ proto string mb_detect_encoding(string str [, mixed encoding_list])
Encodings of the given string is returned (as a string) */
PHP_FUNCTION(mb_detect_encoding)
@@ -2749,8 +2720,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string
transfer-encoding [, string linefeed]]])
Converts the string to MIME "encoded-word" in the format of
=?charset?(B|Q)?encoded_string?= */
PHP_FUNCTION(mb_encode_mimeheader)
@@ -2820,8 +2789,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_decode_mimeheader(string string)
Decodes the MIME "encoded-word" in the string */
PHP_FUNCTION(mb_decode_mimeheader)
@@ -2848,8 +2815,6 @@
}
/* }}} */
-
-
/* {{{ proto string mb_convert_kana(string str [, string option] [, string encoding])
Conversion between full-width character and half-width character (Japanese) */
PHP_FUNCTION(mb_convert_kana)
@@ -3196,7 +3161,6 @@
}
/* }}} */
-
/* {{{ HTML numeric entity */
/* {{{ static void php_mbstr_numericentity_exec() */
static void
@@ -3281,7 +3245,6 @@
}
/* }}} */
-
/* {{{ proto string mb_decode_numericentity(string string, array convmap [, string
encoding])
Converts HTML numeric entities to character code */
PHP_FUNCTION(mb_decode_numericentity)
@@ -3289,7 +3252,6 @@
php_mbstr_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
/* }}} */
-
/* }}} */
/* {{{ proto int mb_send_mail(string to, string subject, string message [, string
additional_headers [, string additional_parameters]])
Index: php4/ext/mbstring/mbstring.h
diff -u php4/ext/mbstring/mbstring.h:1.36 php4/ext/mbstring/mbstring.h:1.37
--- php4/ext/mbstring/mbstring.h:1.36 Wed Oct 23 14:32:55 2002
+++ php4/ext/mbstring/mbstring.h Wed Oct 23 15:51:49 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.h,v 1.36 2002/10/23 18:32:55 moriyoshi Exp $ */
+/* $Id: mbstring.h,v 1.37 2002/10/23 19:51:49 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -109,8 +109,8 @@
PHP_FUNCTION(mb_send_mail);
PHP_FUNCTION(mb_get_info);
-char *mbstr_strrchr(const char *s, char c TSRMLS_DC);
-int php_mb_is_leadbyte(const char *s TSRMLS_DC);
+PHPAPI char *php_mb_strrchr(const char *s, char c TSRMLS_DC);
+PHPAPI int php_mb_is_leadbyte(const char *s TSRMLS_DC);
PHPAPI int php_mb_encoding_translation(TSRMLS_D);
ZEND_BEGIN_MODULE_GLOBALS(mbstring)
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.118 php4/main/rfc1867.c:1.119
--- php4/main/rfc1867.c:1.118 Wed Oct 23 12:54:31 2002
+++ php4/main/rfc1867.c Wed Oct 23 15:51:50 2002
@@ -16,7 +16,7 @@
| Jani Taskinen <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.118 2002/10/23 16:54:31 moriyoshi Exp $ */
+/* $Id: rfc1867.c,v 1.119 2002/10/23 19:51:50 moriyoshi Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -904,7 +904,7 @@
#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
if (php_mb_encoding_translation(TSRMLS_C)) {
- s = mbstr_strrchr(filename, '\\' TSRMLS_CC);
+ s = php_mb_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
