diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-02-06 13:04:29 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-06-03 20:25:12 +0900 |
| commit | d142eff6586de0018c9442129201b03c826f2a1e (patch) | |
| tree | e82ae733deeb1a0680a908444bdcbd47afece365 | |
| parent | a4721ec6cdd32b9c23a009e7390fefa1d9148ffd (diff) | |
| download | ruby-d142eff6586de0018c9442129201b03c826f2a1e.tar.gz | |
[ruby/nkf] Constified invariant tables
https://github.com/ruby/nkf/commit/b386ddc11c
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 08b372ffab..6888a43918 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -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_oconv32(nkf_char c2, nkf_char c1); -typedef struct { +typedef const struct { const char *name; nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0); 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_32 = { "UTF-32", w_iconv32, w_oconv32 }; -typedef struct { - const int id; +typedef const struct { + int id; const char *name; - const nkf_native_encoding *base_encoding; + nkf_native_encoding *base_encoding; } nkf_encoding; nkf_encoding nkf_encoding_table[] = { @@ -204,9 +204,9 @@ nkf_encoding nkf_encoding_table[] = { {-1, NULL, NULL} }; -struct { +static const struct { const char *name; - const int id; + int id; } encoding_name_to_id_table[] = { {"US-ASCII", ASCII}, {"ASCII", ASCII}, @@ -4286,7 +4286,7 @@ static const unsigned char *mime_pattern[] = { /* 該当するコ・踉札匹陵ダ菘戮鬢苳糸げるための目印 */ -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, #if defined(UTF8_INPUT_ENABLE) w_iconv, w_iconv, |