summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-09 00:50:37 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-09 00:50:37 +0000
commitec18fc70a3d4636d7ddfcdf3fc1065a02114b982 (patch)
tree16137bfd7724a7d5ae40b8b9b9b14ae9c5a96f52
parent6e0b5f40cc708f93013262c55991a6ab4e115823 (diff)
* ext/nkf/nkf-utf8/nkf.c (options): use input_endian.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/nkf/nkf-utf8/nkf.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index baef55cb0f..f1b05109f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 9 09:12:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c (options): use input_endian.
+
Wed Jul 9 01:38:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_succ): alphabets or numerics mutually enclosing
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index d98511fd27..136ebf28da 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -6086,8 +6086,8 @@ options(unsigned char *cp)
input_endian = ENDIAN_BIG;
}
enc_idx = enc_idx == UTF_16
- ? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
- : (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
+ ? (input_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
+ : (input_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
input_encoding = nkf_enc_from_index(enc_idx);
}
continue;