From 936abb91896fb2770880ee8796342cf8c996aa3e Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 15 Jan 2008 13:36:18 +0000 Subject: * encoding.c (ENC_REGISTER): use &OnigEncoding*. (ENCINDEX_UTF_8): renamed from ENCINDEX_UTF8. (rb_enc_init): use ENC_REGISTER. * include/ruby/oniguruma.h (OnigEncodingUTF8, ONIG_ENCODING_UTF8): removed. * enc/*.c: remove use of &encoding_*; use enc argument instead. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/gb18030.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'enc/gb18030.c') diff --git a/enc/gb18030.c b/enc/gb18030.c index e3b72f264..100c2bb78 100644 --- a/enc/gb18030.c +++ b/enc/gb18030.c @@ -30,8 +30,6 @@ #include "regenc.h" -OnigEncodingDeclare(GB18030); - #if 1 #define DEBUG_GB18030(arg) #else @@ -80,20 +78,20 @@ gb18030_mbc_enc_len(const UChar* p, const UChar* end, OnigEncoding enc) static OnigCodePoint gb18030_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) { - return onigenc_mbn_mbc_to_code(&OnigEncodingName(GB18030), p, end); + return onigenc_mbn_mbc_to_code(enc, p, end); } static int gb18030_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) { - return onigenc_mb4_code_to_mbc(&OnigEncodingName(GB18030), code, buf); + return onigenc_mb4_code_to_mbc(enc, code, buf); } static int gb18030_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { - return onigenc_mbn_mbc_case_fold(&OnigEncodingName(GB18030), flag, + return onigenc_mbn_mbc_case_fold(enc, flag, pp, end, lower); } @@ -102,14 +100,14 @@ static int gb18030_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end, OnigEncoding enc) { - return onigenc_mbn_is_mbc_ambiguous(&OnigEncodingName(GB18030), flag, pp, end); + return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end); } #endif static int gb18030_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { - return onigenc_mb4_is_code_ctype(&OnigEncodingName(GB18030), code, ctype); + return onigenc_mb4_is_code_ctype(enc, code, ctype); } enum state { -- cgit