diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-22 18:19:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-22 18:19:34 +0000 |
| commit | 8b9f97df4a04bb7080df605133bd74a9a871376a (patch) | |
| tree | 9463892468e81ca292e8514b25c92decce95e594 | |
| parent | 5187f864cb84f727e042efce6bdf3e0f62d09d65 (diff) | |
| download | ruby-8b9f97df4a04bb7080df605133bd74a9a871376a.tar.gz ruby-8b9f97df4a04bb7080df605133bd74a9a871376a.tar.xz ruby-8b9f97df4a04bb7080df605133bd74a9a871376a.zip | |
* ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
constified.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 12 |
2 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Jul 23 03:19:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename): + constified. + Wed Jul 23 03:02:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/syck: suppress warnings. diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 136ebf28d..a4ad15dcf 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -318,7 +318,7 @@ extern POINT _BufferSize; #endif struct input_code{ - char *name; + const char *name; nkf_char stat; nkf_char score; nkf_char index; @@ -328,7 +328,7 @@ struct input_code{ int _file_stat; }; -static char *input_codename = NULL; /* NULL: unestablished, "": BINARY */ +static const char *input_codename = NULL; /* NULL: unestablished, "": BINARY */ static nkf_encoding *input_encoding = NULL; static nkf_encoding *output_encoding = NULL; @@ -439,7 +439,7 @@ static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0; #endif static int guess_f = 0; /* 0: OFF, 1: ON, 2: VERBOSE */ -static void set_input_codename(char *codename); +static void set_input_codename(const char *codename); #ifdef EXEC_IO static int exec_f = 0; @@ -3499,7 +3499,7 @@ z_conv(nkf_char c2, nkf_char c1) if (alpha_f&8 && c2 == 0) { /* HTML Entity */ - char *entity = 0; + const char *entity = 0; switch (c1){ case '>': entity = ">"; break; case '<': entity = "<"; break; @@ -3982,7 +3982,7 @@ debug(const char *str) #endif static void -set_input_codename(char *codename) +set_input_codename(const char *codename) { if (!input_codename) { input_codename = codename; @@ -3991,7 +3991,7 @@ set_input_codename(char *codename) } } -static char* +static const char* get_guessed_code(void) { if (input_codename && !*input_codename) { |