* ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):

  type of content is unsigned char.

* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.

* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.

* ext/nkf//nkf.c (options): type of option is unsigned char.

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

3 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 18fb8dd84b..165fb17631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Apr 22 21:09:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
+	  type of content is unsigned char.
+
+	* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.
+
+	* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.
+
+	* ext/nkf//nkf.c (options): type of option is unsigned char.
+
 Tue Apr 22 20:51:58 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c (z_conv): characters must be nkf_char.
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 084b2c469f..523462362b 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -2456,14 +2456,14 @@ void w_oconv32(nkf_char c2, nkf_char c1)
 
 #define SCORE_INIT (SCORE_iMIME)
 
-static const char score_table_A0[] = {
+static const unsigned char score_table_A0[] = {
     0, 0, 0, 0,
     0, 0, 0, 0,
     0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
     SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
 };
 
-static const char score_table_F0[] = {
+static const unsigned char score_table_F0[] = {
     SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
     SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
     SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932,
@@ -3041,7 +3041,7 @@ static void init_broken_state(void)
     memset(&broken_state, 0, sizeof(broken_state));
 }
 
-static void push_broken_buf(c)
+static void push_broken_buf(nkf_char c)
 {
     broken_state.buf[broken_state.count++] = c;
 }
@@ -5599,7 +5599,7 @@ void options(unsigned char *cp)
                 if (strcmp(long_option[i].name, "oc=") == 0){
 		    nkf_str_upcase((char *)p, codeset, 32);
 		    enc = nkf_enc_find(codeset);
-		    if (enc <= 0) continue;
+		    if (enc == 0) continue;
 		    output_encoding = enc;
                     continue;
 		}
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index ba8ffc978f..c11a042c57 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -80,7 +80,7 @@ rb_encoding* rb_nkf_enc_get(const char *name)
 int nkf_split_options(const char *arg)
 {
     int count = 0;
-    char option[256];
+    unsigned char option[256];
     int i = 0, j = 0;
     int is_escaped = FALSE;
     int is_single_quoted = FALSE;