From dca4de683847593efef8434192086bb98b79e946 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 8 Jan 2008 06:40:33 +0000 Subject: * 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 --- ChangeLog | 10 +++++++++- enc/unicode.c | 3 ++- enc/utf16_be.c | 2 +- enc/utf16_le.c | 2 +- enc/utf32_be.c | 2 +- enc/utf32_le.c | 2 +- regenc.c | 4 ++-- regenc.h | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb722be3fe..d3608c06ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -Tue Jan 8 15:27:20 2008 Nobuyoshi Nakada +Tue Jan 8 15:40:31 2008 Nobuyoshi Nakada + + * 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. diff --git a/enc/unicode.c b/enc/unicode.c index 4642bbe5c1..126588f3fb 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -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); diff --git a/enc/utf16_be.c b/enc/utf16_be.c index 5d98151706..0c64a46468 100644 --- a/enc/utf16_be.c +++ b/enc/utf16_be.c @@ -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 */ diff --git a/enc/utf16_le.c b/enc/utf16_le.c index 7b50b8481a..f16a7cdca5 100644 --- a/enc/utf16_le.c +++ b/enc/utf16_le.c @@ -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 */ diff --git a/enc/utf32_be.c b/enc/utf32_be.c index 7ebf1a2eaf..c50e3871d4 100644 --- a/enc/utf32_be.c +++ b/enc/utf32_be.c @@ -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 */ diff --git a/enc/utf32_le.c b/enc/utf32_le.c index 0d443f1b75..9aaff4926d 100644 --- a/enc/utf32_le.c +++ b/enc/utf32_le.c @@ -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 */ diff --git a/regenc.c b/regenc.c index c6262b0909..7bc978a09a 100644 --- a/regenc.c +++ b/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') { diff --git a/regenc.h b/regenc.h index e34ce40b47..e393af7537 100644 --- a/regenc.h +++ b/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)); -- cgit v1.2.1