clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed highlight related bugs (in case shift_jis input/output filters are enabled)

Browse Source
This commit is contained in:
Masaki Fujimoto 2002-10-20 02:57:40 +00:00
parent 4efcd0f5d1
commit a6ecdca0ef
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mbstring/mbfilter.c
View File

@ -7650,7 +7650,7 @@ mbfl_oddlen(mbfl_string *string)
int len, n, m, k;
unsigned char *p;
const unsigned char *mbtab;
mbfl_encoding *encoding;
const mbfl_encoding *encoding;
encoding = mbfl_no2encoding(string->no_encoding);
if (encoding == NULL || string == NULL) {

12
ext/mbstring/mbstring.c
View File

@ -3473,7 +3473,7 @@ PHPAPI int php_mbstring_set_zend_encoding(TSRMLS_D)
/*
* mb_detect_encoding (interface for Zend Engine)
*/
char* php_mbstring_encoding_detector(char *arg_string, int arg_length, char *arg_list TSRMLS_DC)
char* php_mbstring_encoding_detector(const char *arg_string, int arg_length, char *arg_list TSRMLS_DC)
{
mbfl_string string;
const char *ret;
@ -3496,7 +3496,7 @@ char* php_mbstring_encoding_detector(char *arg_string, int arg_length, char *arg
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
string.val = arg_string;
string.val = (char*)arg_string;
string.len = arg_length;
ret = mbfl_identify_encoding_name(&string, elist, size);
if (list != NULL) {
@ -3513,7 +3513,7 @@ char* php_mbstring_encoding_detector(char *arg_string, int arg_length, char *arg
/*
* mb_convert_encoding (interface for Zend Engine)
*/
int php_mbstring_encoding_converter(char **to, int *to_length, char *from,
int php_mbstring_encoding_converter(char **to, int *to_length, const char *from,
int from_length, const char *encoding_to, const char *encoding_from
TSRMLS_DC)
{
@ -3536,7 +3536,7 @@ int php_mbstring_encoding_converter(char **to, int *to_length, char *from,
mbfl_string_init(&result);
string.no_encoding = from_encoding;
string.no_language = MBSTRG(current_language);
string.val = from;
string.val = (char*)from;
string.len = from_length;
/* initialize converter */
@ -3562,14 +3562,14 @@ int php_mbstring_encoding_converter(char **to, int *to_length, char *from,
* returns number of odd (e.g. appears only first byte of multibyte
* character) chars
*/
int php_mbstring_oddlen(char *string, int length, const char *encoding TSRMLS_DC)
int php_mbstring_oddlen(const char *string, int length, const char *encoding TSRMLS_DC)
{
mbfl_string mb_string;
mbfl_string_init(&mb_string);
mb_string.no_language = MBSTRG(current_language);
mb_string.no_encoding = mbfl_name2no_encoding(encoding);
mb_string.val = string;
mb_string.val = (char*)string;
mb_string.len = length;
if(mb_string.no_encoding == mbfl_no_encoding_invalid)

6
ext/mbstring/mbstring.h
View File

@ -164,12 +164,12 @@ struct mb_overload_def {
#ifdef ZEND_MULTIBYTE
PHPAPI int php_mbstring_set_zend_encoding(TSRMLS_D);
char* php_mbstring_encoding_detector(char *string, int length, char *list
char* php_mbstring_encoding_detector(const char *string, int length, char *list
TSRMLS_DC);
int php_mbstring_encoding_converter(char **to, int *to_length, char *from,
int php_mbstring_encoding_converter(char **to, int *to_length, const char *from,
int from_length, const char *encoding_to, const char *encoding_from
TSRMLS_DC);
int php_mbstring_oddlen(char *string, int length, const char *encoding TSRMLS_DC);
int php_mbstring_oddlen(const char *string, int length, const char *encoding TSRMLS_DC);
#endif /* ZEND_MULTIBYTE */
SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler);

2
main/main.c
View File

@ -518,7 +518,7 @@ PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1,
/* {{{ php_html_puts */
PHPAPI void php_html_puts(const char *str, uint size TSRMLS_DC)
{
zend_html_puts(str, size);
zend_html_puts(str, size TSRMLS_CC);
}
/* }}} */