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

[ruby/nkf] Constified invariant tables

Browse Source 
https://github.com/ruby/nkf/commit/b386ddc11c
This commit is contained in:
Nobuyoshi Nakada 2021-02-06 13:04:29 +09:00 committed by git
parent a4721ec6cd
commit d142eff658
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ static void w_oconv(nkf_char c2, nkf_char c1);
static void w_oconv16(nkf_char c2, nkf_char c1); static void w_oconv16(nkf_char c2, nkf_char c1);
static void w_oconv32(nkf_char c2, nkf_char c1); static void w_oconv32(nkf_char c2, nkf_char c1);
typedef struct { typedef const struct {
const char *name; const char *name;
nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0); nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0);
void (*oconv)(nkf_char c2, nkf_char c1); void (*oconv)(nkf_char c2, nkf_char c1);
@ -158,10 +158,10 @@ nkf_native_encoding NkfEncodingUTF_8 = { "UTF-8", w_iconv, w_oconv };
nkf_native_encoding NkfEncodingUTF_16 = { "UTF-16", w_iconv16, w_oconv16 }; nkf_native_encoding NkfEncodingUTF_16 = { "UTF-16", w_iconv16, w_oconv16 };
nkf_native_encoding NkfEncodingUTF_32 = { "UTF-32", w_iconv32, w_oconv32 }; nkf_native_encoding NkfEncodingUTF_32 = { "UTF-32", w_iconv32, w_oconv32 };
typedef struct { typedef const struct {
const int id; int id;
const char *name; const char *name;
const nkf_native_encoding *base_encoding; nkf_native_encoding *base_encoding;
} nkf_encoding; } nkf_encoding;
nkf_encoding nkf_encoding_table[] = { nkf_encoding nkf_encoding_table[] = {
@ -204,9 +204,9 @@ nkf_encoding nkf_encoding_table[] = {
{-1, NULL, NULL} {-1, NULL, NULL}
}; };
struct { static const struct {
const char *name; const char *name;
const int id; int id;
} encoding_name_to_id_table[] = { } encoding_name_to_id_table[] = {
{"US-ASCII", ASCII}, {"US-ASCII", ASCII},
{"ASCII", ASCII}, {"ASCII", ASCII},
@ -4286,7 +4286,7 @@ static const unsigned char *mime_pattern[] = {
/* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */ /* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = { static nkf_char (*const mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
e_iconv, s_iconv, 0, 0, 0, 0, 0, e_iconv, s_iconv, 0, 0, 0, 0, 0,
#if defined(UTF8_INPUT_ENABLE) #if defined(UTF8_INPUT_ENABLE)
w_iconv, w_iconv, w_iconv, w_iconv,