diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-28 06:42:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-28 06:42:33 +0000 |
| commit | 7fac9ffae3a631cbe8e8fc8bc4a68cfc58e84439 (patch) | |
| tree | 029a3119475679a7a429fe4fddd73c2a76730520 | |
| parent | 42c99028bf1ed3e7adffd4d643362d5e75a5a7af (diff) | |
| download | ruby-7fac9ffae3a631cbe8e8fc8bc4a68cfc58e84439.tar.gz ruby-7fac9ffae3a631cbe8e8fc8bc4a68cfc58e84439.tar.xz ruby-7fac9ffae3a631cbe8e8fc8bc4a68cfc58e84439.zip | |
* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
variables. fixed: [ruby-list:40445]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Dec 28 15:41:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static + variables. fixed: [ruby-list:40445] + Tue Dec 28 15:25:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 5fa1956bf..2db250045 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -1303,6 +1303,10 @@ struct input_code * find_inputcode_byfunc(iconv_func) return 0; } +#ifdef CHECK_OPTION +static int (*iconv_for_check)() = 0; +#endif + #ifdef ANSI_C_PROTOTYPE void set_iconv(int f, int (*iconv_func)(int c2,int c1,int c0)) #else @@ -1311,9 +1315,6 @@ void set_iconv(f, iconv_func) int (*iconv_func)(); #endif { -#ifdef CHECK_OPTION - static int (*iconv_for_check)() = 0; -#endif #ifdef INPUT_CODE_FIX if (f || !input_f) #endif @@ -4292,6 +4293,9 @@ reinit() broken_counter = 0; broken_last = 0; z_prev2=0,z_prev1=0; +#ifdef CHECK_OPTION + iconv_for_check = 0; +#endif } #endif |