summaryrefslogtreecommitdiff
path: root/ext/nkf/nkf-utf8
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-29 15:47:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-29 15:47:46 +0000
commitb921425c49392de00d1516c3fa772eeaf60f6d7f (patch)
treeb4175bf9f1dab2271e9ad3d5f4e773e047d64cfa /ext/nkf/nkf-utf8
parenteace50a9d79e1f3ec58011b8238d0b79e9a716b6 (diff)
* ext/nkf/nkf-utf8/nkf.c: constified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf/nkf-utf8')
-rw-r--r--ext/nkf/nkf-utf8/nkf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 3d690dc..2f21458 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);