mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
warnings. * regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added encoding argument. * enc/utf{16,32}_{be,le}.c: added init functions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4cc42da33f
commit
dca4de6838
8 changed files with 18 additions and 9 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,4 +1,12 @@
|
|||
Tue Jan 8 15:27:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Tue Jan 8 15:40:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
|
||||
warnings.
|
||||
|
||||
* regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
|
||||
encoding argument.
|
||||
|
||||
* enc/utf{16,32}_{be,le}.c: added init functions.
|
||||
|
||||
* enc/utf{16,32}_{be,le}.c: imported from Oniguruma 5.9.1.
|
||||
|
||||
|
|
|
@ -10781,7 +10781,8 @@ onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
|
|||
|
||||
extern int
|
||||
onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
|
||||
const OnigCodePoint* ranges[])
|
||||
const OnigCodePoint* ranges[],
|
||||
struct OnigEncodingTypeST* enc ARG_UNUSED)
|
||||
{
|
||||
*sb_out = 0x00;
|
||||
return onigenc_unicode_ctype_code_range(ctype, ranges);
|
||||
|
|
|
@ -217,7 +217,7 @@ utf16be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
|
|||
flag, p, end, items);
|
||||
}
|
||||
|
||||
OnigEncodingType OnigEncodingUTF16_BE = {
|
||||
OnigEncodingDefine(utf16_be, UTF16_BE) = {
|
||||
utf16be_mbc_enc_len,
|
||||
"UTF-16BE", /* name */
|
||||
4, /* max byte length */
|
||||
|
|
|
@ -218,7 +218,7 @@ utf16le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
|
|||
flag, p, end, items);
|
||||
}
|
||||
|
||||
OnigEncodingType OnigEncodingUTF16_LE = {
|
||||
OnigEncodingDefine(utf16_le, UTF16_LE) = {
|
||||
utf16le_mbc_enc_len,
|
||||
"UTF-16LE", /* name */
|
||||
4, /* max byte length */
|
||||
|
|
|
@ -173,7 +173,7 @@ utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
|
|||
flag, p, end, items);
|
||||
}
|
||||
|
||||
OnigEncodingType OnigEncodingUTF32_BE = {
|
||||
OnigEncodingDefine(utf32_be, UTF32_BE) = {
|
||||
utf32be_mbc_enc_len,
|
||||
"UTF-32BE", /* name */
|
||||
4, /* max byte length */
|
||||
|
|
|
@ -173,7 +173,7 @@ utf32le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
|
|||
flag, p, end, items);
|
||||
}
|
||||
|
||||
OnigEncodingType OnigEncodingUTF32_LE = {
|
||||
OnigEncodingDefine(utf32_le, UTF32_LE) = {
|
||||
utf32le_mbc_enc_len,
|
||||
"UTF-32LE", /* name */
|
||||
4, /* max byte length */
|
||||
|
|
4
regenc.c
4
regenc.c
|
@ -125,7 +125,7 @@ onigenc_strlen_null(OnigEncoding enc, const UChar* s)
|
|||
{
|
||||
int n = 0;
|
||||
UChar* p = (UChar* )s;
|
||||
UChar* e = p + strlen(s);
|
||||
UChar* e = p + strlen((const char *)s);
|
||||
|
||||
while (1) {
|
||||
if (*p == '\0') {
|
||||
|
@ -151,7 +151,7 @@ onigenc_str_bytelen_null(OnigEncoding enc, const UChar* s)
|
|||
{
|
||||
UChar* start = (UChar* )s;
|
||||
UChar* p = (UChar* )s;
|
||||
UChar* e = p + strlen(s);
|
||||
UChar* e = p + strlen((const char *)s);
|
||||
|
||||
while (1) {
|
||||
if (*p == '\0') {
|
||||
|
|
2
regenc.h
2
regenc.h
|
@ -145,7 +145,7 @@ ONIG_EXTERN int onigenc_mb4_is_code_ctype P_((OnigEncoding enc, OnigCodePoint co
|
|||
|
||||
/* in enc/unicode.c */
|
||||
ONIG_EXTERN int onigenc_unicode_is_code_ctype P_((OnigCodePoint code, unsigned int ctype, OnigEncoding enc));
|
||||
ONIG_EXTERN int onigenc_utf16_32_get_ctype_code_range P_((OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[]));
|
||||
ONIG_EXTERN int onigenc_utf16_32_get_ctype_code_range P_((OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[], OnigEncoding enc));
|
||||
ONIG_EXTERN int onigenc_unicode_ctype_code_range P_((int ctype, const OnigCodePoint* ranges[]));
|
||||
ONIG_EXTERN int onigenc_unicode_get_case_fold_codes_by_str P_((OnigEncoding enc, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]));
|
||||
ONIG_EXTERN int onigenc_unicode_mbc_case_fold P_((OnigEncoding enc, OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* fold));
|
||||
|
|
Loading…
Reference in a new issue