diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-29 15:47:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-29 15:47:46 +0000 |
| commit | e19106d361a7081138968bdeab381056cec20ab6 (patch) | |
| tree | b4175bf9f1dab2271e9ad3d5f4e773e047d64cfa | |
| parent | e31378b1f87160739d559db8d2ad936cfa2e84f4 (diff) | |
| download | ruby-e19106d361a7081138968bdeab381056cec20ab6.tar.gz ruby-e19106d361a7081138968bdeab381056cec20ab6.tar.xz ruby-e19106d361a7081138968bdeab381056cec20ab6.zip | |
* ext/nkf/nkf-utf8/nkf.c: constified.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 4 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Tue Sep 30 00:47:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: constified. + Mon Sep 29 23:32:25 2008 Tanaka Akira <akr@fsij.org> * string.c (rb_str_subseq): don't use rb_str_drop_bytes for short diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 3d690dcb3..2f214581a 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -6043,8 +6043,7 @@ options(unsigned char *cp) } else if (cp[0] == 'B') { cp++; } else { - output_encoding = nkf_enc_from_index(enc_idx); - continue; + goto utf_no_endian; } if (cp[0] == '0'){ cp++; @@ -6053,6 +6052,7 @@ options(unsigned char *cp) : (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE); } else { output_bom_f = TRUE; + utf_no_endian: enc_idx = enc_idx == UTF_16 ? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM) : (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-09-29" +#define RUBY_RELEASE_DATE "2008-09-30" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080929 +#define RUBY_RELEASE_CODE 20080930 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |