* ext/nkf/nkf-utf8/nkf.c: constified.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f778f1982..5aa183f41b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3d690dcb37..2f214581ac 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);
diff --git a/version.h b/version.h
index b37b37501d..ad9e383ee5 100644
--- a/version.h
+++ b/version.h
@@ -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[];