[Refactor] #37353 型の置換。 / Type replacement.

diff --git a/src/autopick.c b/src/autopick.c
index ee5f8a0..0e24f5d 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -3840,145 +3840,145 @@ static void search_for_string(text_body_type *tb, cptr search_str, bool forward)
 /* Manu names */
 #ifdef JP
 
-static char MN_QUIT[] = "セーブ無しで終了";
-static char MN_SAVEQUIT[] = "セーブして終了";
-static char MN_REVERT[] = "全ての変更を破棄";
-static char MN_HELP[] = "ヘルプ";
-
-static char MN_MOVE[] = "カーソル移動";
-static char MN_LEFT[] =   "左          (←矢印キー)";
-static char MN_DOWN[] =   "下          (↓矢印キー)";
-static char MN_UP[] =     "上          (↑矢印キー)";
-static char MN_RIGHT[] =  "右          (→矢印キー)";
-static char MN_BOL[] =    "行の先頭";
-static char MN_EOL[] =    "行の終端";
-static char MN_PGUP[] =   "上のページ  (PageUpキー)";
-static char MN_PGDOWN[] = "下のページ  (PageDownキー)";
-static char MN_TOP[] =    "1行目へ移動 (Homeキー)";
-static char MN_BOTTOM[] = "最下行へ移動(Endキー)";
-
-static char MN_EDIT[] = "編集";
-static char MN_CUT[] = "カット";
-static char MN_COPY[] = "コピー";
-static char MN_PASTE[] = "ペースト";
-static char MN_BLOCK[] = "選択範囲の指定";
-static char MN_KILL_LINE[] = "行の残りを削除";
-static char MN_DELETE_CHAR[] = "1文字削除";
-static char MN_BACKSPACE[] = "バックスペース";
-static char MN_RETURN[] = "改行";
-
-static char MN_SEARCH[] = "検索";
-static char MN_SEARCH_STR[] = "文字列で検索";
-static char MN_SEARCH_FORW[] = "前方へ再検索";
-static char MN_SEARCH_BACK[] = "後方へ再検索";
-static char MN_SEARCH_OBJ[] = "アイテムを選択して検索";
-static char MN_SEARCH_DESTROYED[] = "自動破壊されたアイテムで検索";
-
-static char MN_INSERT[] = "色々挿入";
-static char MN_INSERT_OBJECT[] = "選択したアイテムの名前を挿入";
-static char MN_INSERT_DESTROYED[] = "自動破壊されたアイテムの名前を挿入";
-static char MN_INSERT_BLOCK[] = "条件分岐ブロックの例を挿入";
-static char MN_INSERT_MACRO[] = "マクロ定義を挿入";
-static char MN_INSERT_KEYMAP[] = "キーマップ定義を挿入";
-
-static char MN_COMMAND_LETTER[] = "拾い/破壊/放置の選択";
-static char MN_CL_AUTOPICK[] = "「 」 (自動拾い)";
-static char MN_CL_DESTROY[] = "「!」 (自動破壊)";
-static char MN_CL_LEAVE[] = "「~」 (放置)";
-static char MN_CL_QUERY[] = "「;」 (確認して拾う)";
-static char MN_CL_NO_DISP[] = "「(」 (マップコマンドで表示しない)";
-
-static char MN_ADJECTIVE_GEN[] = "形容詞(一般)の選択";
-static char MN_RARE[] = "レアな (装備)";
-static char MN_COMMON[] = "ありふれた (装備)";
-
-static char MN_ADJECTIVE_SPECIAL[] = "形容詞(特殊)の選択";
-static char MN_BOOSTED[] = "ダイス目の違う (武器)";
-static char MN_MORE_DICE[] = "ダイス目 # 以上の (武器)";
-static char MN_MORE_BONUS[] = "修正値 # 以上の (指輪等)";
-static char MN_WANTED[] = "賞金首の (死体)";
-static char MN_UNIQUE[] = "ユニーク・モンスターの (死体)";
-static char MN_HUMAN[] = "人間の (死体)";
-static char MN_UNREADABLE[] = "読めない (魔法書)";
-static char MN_REALM1[] = "第一領域の (魔法書)";
-static char MN_REALM2[] = "第二領域の (魔法書)";
-static char MN_FIRST[] = "1冊目の (魔法書)";
-static char MN_SECOND[] = "2冊目の (魔法書)";
-static char MN_THIRD[] = "3冊目の (魔法書)";
-static char MN_FOURTH[] = "4冊目の (魔法書)";
-
-static char MN_NOUN[] = "名詞の選択";
+static GAME_TEXT MN_QUIT[] = "セーブ無しで終了";
+static GAME_TEXT MN_SAVEQUIT[] = "セーブして終了";
+static GAME_TEXT MN_REVERT[] = "全ての変更を破棄";
+static GAME_TEXT MN_HELP[] = "ヘルプ";
+
+static GAME_TEXT MN_MOVE[] = "カーソル移動";
+static GAME_TEXT MN_LEFT[] =   "左          (←矢印キー)";
+static GAME_TEXT MN_DOWN[] =   "下          (↓矢印キー)";
+static GAME_TEXT MN_UP[] =     "上          (↑矢印キー)";
+static GAME_TEXT MN_RIGHT[] =  "右          (→矢印キー)";
+static GAME_TEXT MN_BOL[] =    "行の先頭";
+static GAME_TEXT MN_EOL[] =    "行の終端";
+static GAME_TEXT MN_PGUP[] =   "上のページ  (PageUpキー)";
+static GAME_TEXT MN_PGDOWN[] = "下のページ  (PageDownキー)";
+static GAME_TEXT MN_TOP[] =    "1行目へ移動 (Homeキー)";
+static GAME_TEXT MN_BOTTOM[] = "最下行へ移動(Endキー)";
+
+static GAME_TEXT MN_EDIT[] = "編集";
+static GAME_TEXT MN_CUT[] = "カット";
+static GAME_TEXT MN_COPY[] = "コピー";
+static GAME_TEXT MN_PASTE[] = "ペースト";
+static GAME_TEXT MN_BLOCK[] = "選択範囲の指定";
+static GAME_TEXT MN_KILL_LINE[] = "行の残りを削除";
+static GAME_TEXT MN_DELETE_CHAR[] = "1文字削除";
+static GAME_TEXT MN_BACKSPACE[] = "バックスペース";
+static GAME_TEXT MN_RETURN[] = "改行";
+
+static GAME_TEXT MN_SEARCH[] = "検索";
+static GAME_TEXT MN_SEARCH_STR[] = "文字列で検索";
+static GAME_TEXT MN_SEARCH_FORW[] = "前方へ再検索";
+static GAME_TEXT MN_SEARCH_BACK[] = "後方へ再検索";
+static GAME_TEXT MN_SEARCH_OBJ[] = "アイテムを選択して検索";
+static GAME_TEXT MN_SEARCH_DESTROYED[] = "自動破壊されたアイテムで検索";
+
+static GAME_TEXT MN_INSERT[] = "色々挿入";
+static GAME_TEXT MN_INSERT_OBJECT[] = "選択したアイテムの名前を挿入";
+static GAME_TEXT MN_INSERT_DESTROYED[] = "自動破壊されたアイテムの名前を挿入";
+static GAME_TEXT MN_INSERT_BLOCK[] = "条件分岐ブロックの例を挿入";
+static GAME_TEXT MN_INSERT_MACRO[] = "マクロ定義を挿入";
+static GAME_TEXT MN_INSERT_KEYMAP[] = "キーマップ定義を挿入";
+
+static GAME_TEXT MN_COMMAND_LETTER[] = "拾い/破壊/放置の選択";
+static GAME_TEXT MN_CL_AUTOPICK[] = "「 」 (自動拾い)";
+static GAME_TEXT MN_CL_DESTROY[] = "「!」 (自動破壊)";
+static GAME_TEXT MN_CL_LEAVE[] = "「~」 (放置)";
+static GAME_TEXT MN_CL_QUERY[] = "「;」 (確認して拾う)";
+static GAME_TEXT MN_CL_NO_DISP[] = "「(」 (マップコマンドで表示しない)";
+
+static GAME_TEXT MN_ADJECTIVE_GEN[] = "形容詞(一般)の選択";
+static GAME_TEXT MN_RARE[] = "レアな (装備)";
+static GAME_TEXT MN_COMMON[] = "ありふれた (装備)";
+
+static GAME_TEXT MN_ADJECTIVE_SPECIAL[] = "形容詞(特殊)の選択";
+static GAME_TEXT MN_BOOSTED[] = "ダイス目の違う (武器)";
+static GAME_TEXT MN_MORE_DICE[] = "ダイス目 # 以上の (武器)";
+static GAME_TEXT MN_MORE_BONUS[] = "修正値 # 以上の (指輪等)";
+static GAME_TEXT MN_WANTED[] = "賞金首の (死体)";
+static GAME_TEXT MN_UNIQUE[] = "ユニーク・モンスターの (死体)";
+static GAME_TEXT MN_HUMAN[] = "人間の (死体)";
+static GAME_TEXT MN_UNREADABLE[] = "読めない (魔法書)";
+static GAME_TEXT MN_REALM1[] = "第一領域の (魔法書)";
+static GAME_TEXT MN_REALM2[] = "第二領域の (魔法書)";
+static GAME_TEXT MN_FIRST[] = "1冊目の (魔法書)";
+static GAME_TEXT MN_SECOND[] = "2冊目の (魔法書)";
+static GAME_TEXT MN_THIRD[] = "3冊目の (魔法書)";
+static GAME_TEXT MN_FOURTH[] = "4冊目の (魔法書)";
+
+static GAME_TEXT MN_NOUN[] = "名詞の選択";
 
 #else
 
-static char MN_QUIT[] = "Quit without save";
-static char MN_SAVEQUIT[] = "Save & Quit";
-static char MN_REVERT[] = "Revert all changes";
-static char MN_HELP[] = "Help";
-
-static char MN_MOVE[] =   "Move cursor";
-static char MN_LEFT[] =   "Left     (Left Arrow key)";
-static char MN_DOWN[] =   "Down     (Down Arrow key)";
-static char MN_UP[] =     "Up       (Up Arrow key)";
-static char MN_RIGHT[] =  "Right    (Right Arrow key)";
-static char MN_BOL[] =    "Beggining of line";
-static char MN_EOL[] =    "End of line";
-static char MN_PGUP[] =   "Page up  (PageUp key)";
-static char MN_PGDOWN[] = "Page down(PageDown key)";
-static char MN_TOP[] =    "Top      (Home key)";
-static char MN_BOTTOM[] = "Bottom   (End key)";
-
-static char MN_EDIT[] = "Edit";
-static char MN_CUT[] = "Cut";
-static char MN_COPY[] = "Copy";
-static char MN_PASTE[] = "Paste";
-static char MN_BLOCK[] = "Select block";
-static char MN_KILL_LINE[] = "Kill rest of line";
-static char MN_DELETE_CHAR[] = "Delete character";
-static char MN_BACKSPACE[] = "Backspace";
-static char MN_RETURN[] = "Return";
-
-static char MN_SEARCH[] = "Search";
-static char MN_SEARCH_STR[] = "Search by string";
-static char MN_SEARCH_FORW[] = "Search forward";
-static char MN_SEARCH_BACK[] = "Search backward";
-static char MN_SEARCH_OBJ[] = "Search by inventory object";
-static char MN_SEARCH_DESTROYED[] = "Search by destroyed object";
-
-static char MN_INSERT[] = "Insert...";
-static char MN_INSERT_OBJECT[] = "Insert name of choosen object";
-static char MN_INSERT_DESTROYED[] = "Insert name of destroyed object";
-static char MN_INSERT_BLOCK[] = "Insert conditional block";
-static char MN_INSERT_MACRO[] = "Insert a macro definition";
-static char MN_INSERT_KEYMAP[] = "Insert a keymap definition";
-
-static char MN_COMMAND_LETTER[] = "Command letter";
-static char MN_CL_AUTOPICK[] = "' ' (Auto pick)";
-static char MN_CL_DESTROY[] = "'!' (Auto destroy)";
-static char MN_CL_LEAVE[] = "'~' (Leave it on the floor)";
-static char MN_CL_QUERY[] = "';' (Query to pick up)";
-static char MN_CL_NO_DISP[] = "'(' (No display on the large map)";
-
-static char MN_ADJECTIVE_GEN[] = "Adjective (general)";
-static char MN_RARE[] = "rare (equipments)";
-static char MN_COMMON[] = "common (equipments)";
-
-static char MN_ADJECTIVE_SPECIAL[] = "Adjective (special)";
-static char MN_BOOSTED[] = "dice boosted (weapons)";
-static char MN_MORE_DICE[] = "more than # dice (weapons)";
-static char MN_MORE_BONUS[] = "more bonus than # (rings etc.)";
-static char MN_WANTED[] = "wanted (corpse)";
-static char MN_UNIQUE[] = "unique (corpse)";
-static char MN_HUMAN[] = "human (corpse)";
-static char MN_UNREADABLE[] = "unreadable (spellbooks)";
-static char MN_REALM1[] = "realm1 (spellbooks)";
-static char MN_REALM2[] = "realm2 (spellbooks)";
-static char MN_FIRST[] = "first (spellbooks)";
-static char MN_SECOND[] = "second (spellbooks)";
-static char MN_THIRD[] = "third (spellbooks)";
-static char MN_FOURTH[] = "fourth (spellbooks)";
-
-static char MN_NOUN[] = "Keywords (noun)";
+static GAME_TEXT MN_QUIT[] = "Quit without save";
+static GAME_TEXT MN_SAVEQUIT[] = "Save & Quit";
+static GAME_TEXT MN_REVERT[] = "Revert all changes";
+static GAME_TEXT MN_HELP[] = "Help";
+
+static GAME_TEXT MN_MOVE[] =   "Move cursor";
+static GAME_TEXT MN_LEFT[] =   "Left     (Left Arrow key)";
+static GAME_TEXT MN_DOWN[] =   "Down     (Down Arrow key)";
+static GAME_TEXT MN_UP[] =     "Up       (Up Arrow key)";
+static GAME_TEXT MN_RIGHT[] =  "Right    (Right Arrow key)";
+static GAME_TEXT MN_BOL[] =    "Beggining of line";
+static GAME_TEXT MN_EOL[] =    "End of line";
+static GAME_TEXT MN_PGUP[] =   "Page up  (PageUp key)";
+static GAME_TEXT MN_PGDOWN[] = "Page down(PageDown key)";
+static GAME_TEXT MN_TOP[] =    "Top      (Home key)";
+static GAME_TEXT MN_BOTTOM[] = "Bottom   (End key)";
+
+static GAME_TEXT MN_EDIT[] = "Edit";
+static GAME_TEXT MN_CUT[] = "Cut";
+static GAME_TEXT MN_COPY[] = "Copy";
+static GAME_TEXT MN_PASTE[] = "Paste";
+static GAME_TEXT MN_BLOCK[] = "Select block";
+static GAME_TEXT MN_KILL_LINE[] = "Kill rest of line";
+static GAME_TEXT MN_DELETE_CHAR[] = "Delete character";
+static GAME_TEXT MN_BACKSPACE[] = "Backspace";
+static GAME_TEXT MN_RETURN[] = "Return";
+
+static GAME_TEXT MN_SEARCH[] = "Search";
+static GAME_TEXT MN_SEARCH_STR[] = "Search by string";
+static GAME_TEXT MN_SEARCH_FORW[] = "Search forward";
+static GAME_TEXT MN_SEARCH_BACK[] = "Search backward";
+static GAME_TEXT MN_SEARCH_OBJ[] = "Search by inventory object";
+static GAME_TEXT MN_SEARCH_DESTROYED[] = "Search by destroyed object";
+
+static GAME_TEXT MN_INSERT[] = "Insert...";
+static GAME_TEXT MN_INSERT_OBJECT[] = "Insert name of choosen object";
+static GAME_TEXT MN_INSERT_DESTROYED[] = "Insert name of destroyed object";
+static GAME_TEXT MN_INSERT_BLOCK[] = "Insert conditional block";
+static GAME_TEXT MN_INSERT_MACRO[] = "Insert a macro definition";
+static GAME_TEXT MN_INSERT_KEYMAP[] = "Insert a keymap definition";
+
+static GAME_TEXT MN_COMMAND_LETTER[] = "Command letter";
+static GAME_TEXT MN_CL_AUTOPICK[] = "' ' (Auto pick)";
+static GAME_TEXT MN_CL_DESTROY[] = "'!' (Auto destroy)";
+static GAME_TEXT MN_CL_LEAVE[] = "'~' (Leave it on the floor)";
+static GAME_TEXT MN_CL_QUERY[] = "';' (Query to pick up)";
+static GAME_TEXT MN_CL_NO_DISP[] = "'(' (No display on the large map)";
+
+static GAME_TEXT MN_ADJECTIVE_GEN[] = "Adjective (general)";
+static GAME_TEXT MN_RARE[] = "rare (equipments)";
+static GAME_TEXT MN_COMMON[] = "common (equipments)";
+
+static GAME_TEXT MN_ADJECTIVE_SPECIAL[] = "Adjective (special)";
+static GAME_TEXT MN_BOOSTED[] = "dice boosted (weapons)";
+static GAME_TEXT MN_MORE_DICE[] = "more than # dice (weapons)";
+static GAME_TEXT MN_MORE_BONUS[] = "more bonus than # (rings etc.)";
+static GAME_TEXT MN_WANTED[] = "wanted (corpse)";
+static GAME_TEXT MN_UNIQUE[] = "unique (corpse)";
+static GAME_TEXT MN_HUMAN[] = "human (corpse)";
+static GAME_TEXT MN_UNREADABLE[] = "unreadable (spellbooks)";
+static GAME_TEXT MN_REALM1[] = "realm1 (spellbooks)";
+static GAME_TEXT MN_REALM2[] = "realm2 (spellbooks)";
+static GAME_TEXT MN_FIRST[] = "first (spellbooks)";
+static GAME_TEXT MN_SECOND[] = "second (spellbooks)";
+static GAME_TEXT MN_THIRD[] = "third (spellbooks)";
+static GAME_TEXT MN_FOURTH[] = "fourth (spellbooks)";
+
+static GAME_TEXT MN_NOUN[] = "Keywords (noun)";
 
 #endif
 

diff --git a/src/cmd4.c b/src/cmd4.c
index c439370..28b6605 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -3000,7 +3000,7 @@ void do_cmd_visuals(void)
        char tmp[160];
        char buf[1024];
        bool need_redraw = FALSE;
-       const char *empty_symbol = "<< ? >>";
+       cptr empty_symbol = "<< ? >>";
 
        if (use_bigtile) empty_symbol = "<< ?? >>";
 

diff --git a/src/externs.h b/src/externs.h
index 3c5771e..7164abb 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1156,10 +1156,10 @@ extern byte gamma_table[256];
 extern void build_gamma_table(int gamma);
 #endif /* SUPPORT_GAMMA */
 
-extern size_t my_strcpy(char *buf, const char *src, size_t bufsize);
-extern size_t my_strcat(char *buf, const char *src, size_t bufsize);
-extern char *my_strstr(const char *haystack, const char *needle);
-extern char *my_strchr(const char *ptr, char ch);
+extern size_t my_strcpy(char *buf, cptr src, size_t bufsize);
+extern size_t my_strcat(char *buf, cptr src, size_t bufsize);
+extern char *my_strstr(cptr haystack, cptr needle);
+extern char *my_strchr(cptr ptr, char ch);
 extern void str_tolower(char *str);
 extern int inkey_special(bool numpad_cursor);
 
@@ -1492,8 +1492,8 @@ extern void dump_virtues(FILE * OutFile);
 
 #ifdef JP
 /* japanese.c */
-extern void sindarin_to_kana(char *kana, const char *sindarin);
-extern void jverb( const char *in , char *out , int flag);
+extern void sindarin_to_kana(char *kana, cptr sindarin);
+extern void jverb( cptr in , char *out , int flag);
 extern void sjis2euc(char *str);
 extern void euc2sjis(char *str);
 extern byte codeconv(char *str);
@@ -1511,7 +1511,7 @@ extern cptr make_screen_dump(void);
 extern int soc_write(int sd, char *buf, size_t sz);
 extern int soc_read(int sd, char *buf, size_t sz);
 extern void set_proxy(char *default_url, int default_port);
-extern int connect_server(int timeout, const char *host, int port);
+extern int connect_server(int timeout, cptr host, int port);
 extern int disconnect_server(int sd);
 extern cptr soc_err(void);
 

diff --git a/src/files.c b/src/files.c
index ba7d19a..2bd5070 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -783,8 +783,8 @@ cptr process_pref_file_expr(char **sp, char *fp)
        /* Analyze */
        if (*s == b1)
        {
-               const char *p;
-               const char *t;
+               cptr p;
+               cptr t;
 
                /* Skip b1 */
                s++;

diff --git a/src/inet.c b/src/inet.c
index 5c52880..dadb610 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -278,7 +278,7 @@ static void interrupt_report(int sig)
 
 
 /* サーバにコネクトする関数。 */
-int connect_server(int timeout, const char *host, int port)
+int connect_server(int timeout, cptr host, int port)
 #ifndef MACINTOSH
 {
        int                     sd;

diff --git a/src/init1.c b/src/init1.c
index 98d98e1..e0b94ae 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -4456,8 +4456,8 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
        /* Analyze */
        if (*s == b1)
        {
-               const char *p;
-               const char *t;
+               cptr p;
+               cptr t;
 
                /* Skip b1 */
                s++;

diff --git a/src/japanese.c b/src/japanese.c
index a3c0cf0..9613ba2 100644 (file)
--- a/src/japanese.c
+++ b/src/japanese.c
@@ -63,7 +63,7 @@ static const convert_key s2j_table[] = {
  * @return なし
  * @details
  */
-void sindarin_to_kana(char *kana, const char *sindarin)
+void sindarin_to_kana(char *kana, cptr sindarin)
 {
        char buf[256];
        int idx;
@@ -161,7 +161,7 @@ static const struct jverb_table_t {
  * @return なし
  * @details
  */
-void jverb(const char *in, char *out, int flag)
+void jverb(cptr in, char *out, int flag)
 {
        const struct jverb_table_t * p;
        int in_len = strlen(in);

diff --git a/src/main-win.c b/src/main-win.c
index 2ca3b1f..63fc8b9 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -310,7 +310,7 @@
 #else /* WIN32 */\r
 #define FA_LABEL    0x08        /* Volume label */\r
 #define FA_DIREC    0x10        /* Directory */\r
-unsigned _cdecl _dos_getfileattr(const char *, unsigned *);\r
+unsigned _cdecl _dos_getfileattr(cptr , unsigned *);\r
 #endif /* WIN32 */\r
 \r
 /*\r
@@ -2796,7 +2796,7 @@ static errr Term_wipe_win(int x, int y, int n)
  * what color it should be using to draw with, but perhaps simply changing\r
  * it every time is not too inefficient.  \r
  */\r
-static errr Term_text_win(int x, int y, int n, TERM_COLOR a, const char *s)\r
+static errr Term_text_win(int x, int y, int n, TERM_COLOR a, cptr s)\r
 {\r
        term_data *td = (term_data*)(Term->data);\r
        RECT rc;\r
@@ -2989,7 +2989,7 @@ static errr Term_text_win(int x, int y, int n, TERM_COLOR a, const char *s)
  *\r
  * If "graphics" is not available, we simply "wipe" the given grids.\r
  */\r
-static errr Term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, const char *cp, const TERM_COLOR *tap, const char *tcp)\r
+static errr Term_pict_win(TERM_LEN x, TERM_LEN y, int n, const TERM_COLOR *ap, cptr cp, const TERM_COLOR *tap, cptr tcp)\r
 {\r
        term_data *td = (term_data*)(Term->data);\r
 \r

diff --git a/src/report.c b/src/report.c
index 809e330..d9a56a9 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -100,7 +100,7 @@ static void buf_delete(BUF *b)
  * @param size 追加サイズ
  * @return 追加後のバッファ容量
  */
-static int buf_append(BUF *buf, const char *data, size_t size)
+static int buf_append(BUF *buf, cptr data, size_t size)
 {
        while (buf->size + size > buf->max_size)
        {
@@ -126,7 +126,7 @@ static int buf_append(BUF *buf, const char *data, size_t size)
  * @param fmt 文字列フォーマット
  * @return 追加後のバッファ容量
  */
-static int buf_sprintf(BUF *buf, const char *fmt, ...)
+static int buf_sprintf(BUF *buf, cptr fmt, ...)
 {
        int             ret;
        char    tmpbuf[8192];
@@ -194,7 +194,7 @@ static int buf_write(BUF *buf, int fd)
        return buf->size;
 }
 
-static int buf_search(BUF *buf, const char *str)
+static int buf_search(BUF *buf, cptr str)
 {
        char *ret;
 
@@ -232,7 +232,7 @@ static bool http_post(int sd, cptr url, BUF *buf)
 {
        BUF *output;
        char response_buf[1024] = "";
-       const char *HTTP_RESPONSE_CODE_OK = "HTTP/1.1 200 OK";
+       cptr HTTP_RESPONSE_CODE_OK = "HTTP/1.1 200 OK";
 
        output = buf_new();
        buf_sprintf(output, "POST %s HTTP/1.0\r\n", url);

diff --git a/src/snipe.c b/src/snipe.c
index f6762b7..1d24e38 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -18,7 +18,7 @@ struct snipe_power
 {
        int     min_lev;
        int     mana_cost;
-       const char *name;
+       cptr name;
 };
 
 /*! スナイパー技能の解説メッセージ */

diff --git a/src/util.c b/src/util.c
index ba81ba1..14d645d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -98,7 +98,7 @@ int usleep(huge usecs)
  */
 #ifdef SET_UID
 extern struct passwd *getpwuid(uid_t uid);
-extern struct passwd *getpwnam(const char *name);
+extern struct passwd *getpwnam(cptr name);
 #endif
 
 
@@ -5235,12 +5235,12 @@ void roff_to_buf(cptr str, int maxlen, char *tbuf, size_t bufsize)
  *
  * This function should be equivalent to the strlcpy() function in BSD.
  */
-size_t my_strcpy(char *buf, const char *src, size_t bufsize)
+size_t my_strcpy(char *buf, cptr src, size_t bufsize)
 {
 #ifdef JP
 
        char *d = buf;
-       const char *s = src;
+       cptr s = src;
        size_t len = 0;
 
        if (bufsize > 0) {
@@ -5303,7 +5303,7 @@ size_t my_strcpy(char *buf, const char *src, size_t bufsize)
  *
  * This function should be equivalent to the strlcat() function in BSD.
  */
-size_t my_strcat(char *buf, const char *src, size_t bufsize)
+size_t my_strcat(char *buf, cptr src, size_t bufsize)
 {
        size_t dlen = strlen(buf);
 
@@ -5326,7 +5326,7 @@ size_t my_strcat(char *buf, const char *src, size_t bufsize)
  *
  * my_strstr() can handle Kanji strings correctly.
  */
-char *my_strstr(const char *haystack, const char *needle)
+char *my_strstr(cptr haystack, cptr needle)
 {
        int i;
        int l1 = strlen(haystack);
@@ -5354,7 +5354,7 @@ char *my_strstr(const char *haystack, const char *needle)
  *
  * my_strchr() can handle Kanji strings correctly.
  */
-char *my_strchr(const char *ptr, char ch)
+char *my_strchr(cptr ptr, char ch)
 {
        for ( ; *ptr != '\0'; ptr++)
        {

diff --git a/src/wizard1.c b/src/wizard1.c
index 42bc367..fa67a19 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -517,7 +517,7 @@ typedef struct flag_desc flag_desc;
 struct flag_desc
 {
        const int flag;
-       const char *const desc;
+       cptr const desc;
 };
 
 

diff --git a/src/z-term.h b/src/z-term.h
index e8a2091..04702e8 100644 (file)
--- a/src/z-term.h
+++ b/src/z-term.h
@@ -96,7 +96,7 @@ struct term
        errr (*wipe_hook)(TERM_LEN x, TERM_LEN y, int n); //!< 指定座標テキスト消去実装部 / Hook for drawing some blank spaces
        errr (*text_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, cptr s); //!< テキスト描画実装部 / Hook for drawing a string of chars using an attr
        void (*resize_hook)(void); //!< 画面リサイズ実装部
-       errr (*pict_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *ap, const char *cp, const TERM_COLOR *tap, const char *tcp); //!< タイル描画実装部 / Hook for drawing a sequence of special attr / char pairs
+       errr (*pict_hook)(TERM_LEN x, TERM_LEN y, int n, TERM_COLOR *ap, cptr cp, const TERM_COLOR *tap, cptr tcp); //!< タイル描画実装部 / Hook for drawing a sequence of special attr / char pairs
 };