1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
naruse 2008-04-22 12:20:36 +00:00
parent 17123b2958
commit 0beaddc4e2
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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> 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. * ext/nkf/nkf-utf8/nkf.c (z_conv): characters must be nkf_char.

8
ext/nkf/nkf-utf8/nkf.c
View File

@ -2456,14 +2456,14 @@ void w_oconv32(nkf_char c2, nkf_char c1)
#define SCORE_INIT (SCORE_iMIME) #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, 0, 0, 0, 0, 0, 0, 0,
0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, 0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST, 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_L2, SCORE_L2, SCORE_L2,
SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932, 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)); 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; broken_state.buf[broken_state.count++] = c;
} }
@ -5599,7 +5599,7 @@ void options(unsigned char *cp)
if (strcmp(long_option[i].name, "oc=") == 0){ if (strcmp(long_option[i].name, "oc=") == 0){
nkf_str_upcase((char *)p, codeset, 32); nkf_str_upcase((char *)p, codeset, 32);
enc = nkf_enc_find(codeset); enc = nkf_enc_find(codeset);
if (enc <= 0) continue; if (enc == 0) continue;
output_encoding = enc; output_encoding = enc;
continue; continue;
} }

2
ext/nkf/nkf.c
View File

@ -80,7 +80,7 @@ rb_encoding* rb_nkf_enc_get(const char *name)
int nkf_split_options(const char *arg) int nkf_split_options(const char *arg)
{ {
int count = 0; int count = 0;
char option[256]; unsigned char option[256];
int i = 0, j = 0; int i = 0, j = 0;
int is_escaped = FALSE; int is_escaped = FALSE;
int is_single_quoted = FALSE; int is_single_quoted = FALSE;