ワーニングの除去。

gcc で -pedantic -W -Wall -Wno-unused -Wno-sign-compare -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes を付けて確認。

diff --git a/src/autopick.c b/src/autopick.c
index 5e62297..ed8fd20 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -1490,7 +1490,7 @@ static cptr *read_text_lines(cptr filename, bool user)
        return lines_list;
 }
 
-static cptr *read_pickpref_text_lines()
+static cptr *read_pickpref_text_lines(void)
 {
        char buf[1024];
        cptr *lines_list;
@@ -1627,7 +1627,7 @@ static void delete_string(cptr *lines_list, int n, int x, int y)
 /*
  * Delete or insert string
  */
-void toggle_string(cptr *lines_list, int flg, int y)
+static void toggle_string(cptr *lines_list, int flg, int y)
 {
        autopick_type an_entry, *entry = &an_entry;
 
@@ -1914,7 +1914,7 @@ static cptr ctrl_command_desc[] =
 /*
  * In-game editor of Object Auto-picker/Destoryer
  */
-void do_cmd_edit_autopick()
+void do_cmd_edit_autopick(void)
 {
        static int cx = 0, cy = 0;
        static int upper = 0, left = 0;

diff --git a/src/avatar.c b/src/avatar.c
index f33ff63..b150844 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -181,7 +181,7 @@ int virtue_number(int type)
 
 /* Aux function */
 
-void get_random_virtue(int which)
+static void get_random_virtue(int which)
 {
   int type = 0;
 
@@ -227,7 +227,7 @@ void get_random_virtue(int which)
 
 /* Select virtues & reset values for a new character */
 
-void get_virtues()
+void get_virtues(void)
 {
    int i = 0, j = 0;
 

diff --git a/src/bldg.c b/src/bldg.c
index c56c7f9..590b698 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -571,7 +571,7 @@ static void reset_deck(int deck[])
        }
 }
 
-static bool have_joker()
+static bool have_joker(void)
 {
        int i;
 
@@ -589,7 +589,7 @@ static bool find_card_num(int num)
        return FALSE;
 }
 
-static bool yaku_check_flush()
+static bool yaku_check_flush(void)
 {
        int i, suit;
        bool joker_is_used = FALSE;
@@ -607,7 +607,7 @@ static bool yaku_check_flush()
        return TRUE;
 }
 
-static int yaku_check_straight()
+static int yaku_check_straight(void)
 {
        int i, lowest = 99;
        bool joker_is_used = FALSE;
@@ -663,7 +663,7 @@ static int yaku_check_straight()
 /*
  * 0:nopair 1:1 pair 2:2 pair 3:3 cards 4:full house 6:4cards
  */
-static int yaku_check_pair()
+static int yaku_check_pair(void)
 {
        int i, i2, matching = 0;
 
@@ -714,7 +714,7 @@ static int yaku_check_pair()
 #define ODDS_3C 1
 #define ODDS_2P 1
 
-static int yaku_check()
+static int yaku_check(void)
 {
        prt("                            ", 4, 3);
 
@@ -853,7 +853,7 @@ static void display_kaeruka(int hoge, int kaeruka[])
 }
 
 
-static void display_cards()
+static void display_cards(void)
 {
        int i, j;
        char suitcolor[4] = {TERM_YELLOW, TERM_L_RED, TERM_L_BLUE, TERM_L_GREEN};
@@ -1100,7 +1100,7 @@ static void display_cards()
        }
 }
 
-static int do_poker()
+static int do_poker(void)
 {
        int i, k = 2;
        char cmd;
@@ -3034,7 +3034,7 @@ static void town_history(void)
  * the current +dam of the player.
  */
 static void compare_weapon_aux2(object_type *o_ptr, int numblows,
-                                int r, int c, int mult, char attr[80],
+                                int r, int c, int mult, cptr attr,
                                 u32b f1, u32b f2, u32b f3, byte color)
 {
        char tmp_str[80];

diff --git a/src/cmd1.c b/src/cmd1.c
index b15b0c6..f8380fc 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -688,7 +688,6 @@ void py_pickup_aux(int o_idx)
        char old_name[MAX_NLEN];
        char kazu_str[80];
        int hirottakazu;
-       extern char *object_desc_kosuu(char *t, object_type *o_ptr);
 #else
        char o_name[MAX_NLEN];
 #endif
@@ -1520,7 +1519,7 @@ msg_print("
 }
 
 
-void touch_zap_player(monster_type *m_ptr)
+static void touch_zap_player(monster_type *m_ptr)
 {
        int aura_damage = 0;
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -1617,7 +1616,7 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
 
        int             dss, ddd;
 
-       char            *atk_desc;
+       cptr            atk_desc;
 
        switch (attack)
        {

diff --git a/src/cmd2.c b/src/cmd2.c
index 64c7da7..1aa5e0d 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3239,7 +3239,7 @@ static int breakage_chance(object_type *o_ptr)
 }
 
 
-s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
+static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
 {
        int mult = 10;
 

diff --git a/src/cmd3.c b/src/cmd3.c
index 2480e4e..7005e70 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -1271,9 +1271,9 @@ void do_cmd_uninscribe(void)
 typedef struct flag_insc_table
 {
 #ifdef JP
-       char *japanese;
+       cptr japanese;
 #endif
-       char *english;
+       cptr english;
        u32b flag;
        int num;
        u32b except_flag;
@@ -1294,7 +1294,7 @@ static flag_insc_table flag_insc_plus[] =
        { "õ", "Sr", TR1_SEARCH, 1, 0 },
        { "ÀÖ", "If", TR1_INFRA, 1, 0 },
        { "·¡", "Dg", TR1_TUNNEL, 1, 0 },
-       { NULL, 0, 0, 0 }
+       { NULL, NULL, 0, 0, 0 }
 };
 
 static flag_insc_table flag_insc_immune[] =
@@ -1303,7 +1303,7 @@ static flag_insc_table flag_insc_immune[] =
        { "ÅÅ", "El", TR2_IM_ELEC, 2, 0 },
        { "²Ð", "Fi", TR2_IM_FIRE, 2, 0 },
        { "Îä", "Co", TR2_IM_COLD, 2, 0 },
-       { NULL, 0, 0, 0 }
+       { NULL, NULL, 0, 0, 0 }
 };
 
 static flag_insc_table flag_insc_resistance[] =
@@ -1324,7 +1324,7 @@ static flag_insc_table flag_insc_resistance[] =
        { "ÆÙ", "Ca", TR2_RES_CHAOS, 2, 0 },
        { "Îô", "Di", TR2_RES_DISEN, 2, 0 },
        { "¶²", "Fe", TR2_RES_FEAR, 2, 0 },
-       { NULL, 0, 0, 0 }
+       { NULL, NULL, 0, 0, 0 }
 };
 
 static flag_insc_table flag_insc_misc[] =
@@ -1350,7 +1350,7 @@ static flag_insc_table flag_insc_misc[] =
        { "¼ö", "Cu", TR3_HEAVY_CURSE, 3, TR3_PERMA_CURSE },
        { "´÷", "Ty", TR3_TY_CURSE, 3, 0 },
 #endif
-       { NULL, 0, 0, 0 }
+       { NULL, NULL, 0, 0, 0 }
 };
 
 static flag_insc_table flag_insc_aura[] =
@@ -1360,7 +1360,7 @@ static flag_insc_table flag_insc_aura[] =
        { "Îä", "C", TR3_SH_COLD, 3, 0 },
        { "Ëâ", "M", TR3_NO_MAGIC, 3, 0 },
        { "½Ö", "T", TR3_NO_TELE, 3, 0 },
-       { NULL, 0, 0, 0 }
+       { NULL, NULL, 0, 0, 0 }
 };
 
 static flag_insc_table flag_insc_brand[] =

diff --git a/src/cmd4.c b/src/cmd4.c
index a7af769..887a950 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5162,19 +5162,19 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
        char buf[2048];
 
        int yomikomu = 0;
-       char *tags[4] = {
+       cptr tags[4] = {
                "HEADER_START:",
                "HEADER_END:",
                "FOOTER_START:",
                "FOOTER_END:",
        };
 
-       char *html_head[] = {
+       cptr html_head[] = {
                "<html>\n<body text=\"#ffffff\" bgcolor=\"#000000\">\n",
                "<pre>",
                0,
        };
-       char *html_foot[] = {
+       cptr html_foot[] = {
                "</pre>\n",
                "</body>\n</html>\n",
                0,
@@ -5241,7 +5241,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
                for (x = 0; x < wid - 1; x++)
                {
                        int rv, gv, bv;
-                       char *cc = NULL;
+                       cptr cc = NULL;
                        /* Get the attr/char */
                        (void)(Term_what(x, y, &a, &c));
 
@@ -5318,7 +5318,7 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
 /*
  * Hack -- save a screen dump to a file
  */
-void do_cmd_save_screen_html(void)
+static void do_cmd_save_screen_html(void)
 {
        char buf[1024], tmp[256] = "screen.html";
 
@@ -5598,7 +5598,7 @@ static void ang_sort_art_swap(vptr u, vptr v, int a, int b)
 /*
  * Check the status of "artifacts"
  */
-void do_cmd_knowledge_artifacts(void)
+static void do_cmd_knowledge_artifacts(void)
 {
        int i, k, z, x, y, n = 0;
        u16b why = 3;
@@ -6673,7 +6673,7 @@ static void do_cmd_knowledge_objects(void)
 * List virtues & status
 *
 */
-void do_cmd_knowledge_kubi(void)
+static void do_cmd_knowledge_kubi(void)
 {
        int i;
        FILE *fff;
@@ -6737,7 +6737,7 @@ show_file(TRUE, file_name, "
 * List virtues & status
 *
 */
-void do_cmd_knowledge_virtues(void)
+static void do_cmd_knowledge_virtues(void)
 {
        FILE *fff;
        
@@ -6785,7 +6785,7 @@ show_file(TRUE, file_name, "Ȭ
 * Dungeon
 *
 */
-void do_cmd_knowledge_dungeon(void)
+static void do_cmd_knowledge_dungeon(void)
 {
        FILE *fff;
        
@@ -7291,7 +7291,7 @@ sprintf(rand_tmp_str,"%s (%d 
 * List my home
 *
 */
-void do_cmd_knowledge_home(void)
+static void do_cmd_knowledge_home(void)
 {
        FILE *fff;
        

diff --git a/src/cmd5.c b/src/cmd5.c
index 0a7b73e..3421fba 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -937,7 +937,7 @@ msg_format("
 }
 
 
-void wild_magic(int spell)
+static void wild_magic(int spell)
 {
        int counter = 0;
        int type = SUMMON_BIZARRE1 + randint0(6);
@@ -5765,7 +5765,7 @@ msg_format("%s
        return TRUE;
 }
 
-void do_name_pet(void)
+static void do_name_pet(void)
 {
        monster_type *m_ptr;
        char out_val[20];

diff --git a/src/dungeon.c b/src/dungeon.c
index e54e7b9..19b7194 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1385,7 +1385,7 @@ else msg_format("%s
 }
 
 
-static void check_music()
+static void check_music(void)
 {
         magic_type *s_ptr;
        u32b shouhimana;
@@ -1454,7 +1454,7 @@ static void check_music()
 }
 
 /* Choose one of items that have cursed flag */
-object_type *choose_cursed_obj_name(u32b flag)
+static object_type *choose_cursed_obj_name(u32b flag)
 {
        int i;
        int choices[INVEN_TOTAL-INVEN_RARM];
@@ -4916,7 +4916,7 @@ prt(" '?' 
 
 
 
-bool monster_tsuri(int r_idx)
+static bool monster_tsuri(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 

diff --git a/src/externs.h b/src/externs.h
index 3d12ffc..4a91f14 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -102,6 +102,7 @@ extern kamae kamae_shurui[MAX_KAMAE];
 extern kamae kata_shurui[MAX_KATA];
 extern cptr shougou_moji[5];
 extern byte conv_terrain2feat[MAX_WILDERNESS];
+extern cptr silly_attacks[MAX_SILLY_ATTACK];
 extern monster_power monster_powers[MAX_MONSPELLS];
 
 /* variable.c */
@@ -550,7 +551,7 @@ extern bool auto_destroy_item(int item, int autopick_idx);
 extern void auto_pickup_items(cave_type *c_ptr);
 extern void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr);
 extern void init_autopicker(void);
-extern void do_cmd_edit_autopick();
+extern void do_cmd_edit_autopick(void);
 
 /* birth.c */
 extern void player_birth(void);
@@ -674,6 +675,7 @@ extern void do_cmd_note(void);
 extern void do_cmd_version(void);
 extern void do_cmd_feeling(void);
 extern void do_cmd_load_screen(void);
+extern void do_cmd_save_screen_html_aux(char *filename, int message);
 extern void do_cmd_save_screen(void);
 extern void do_cmd_knowledge(void);
 extern void plural_aux(char * Name);
@@ -720,6 +722,7 @@ extern void safe_setuid_drop(void);
 extern void safe_setuid_grab(void);
 extern s16b tokenize(char *buf, s16b num, char **tokens, int mode);
 extern void display_player(int mode);
+extern errr make_character_dump(FILE *fff);
 extern errr file_character(cptr name, bool full);
 extern errr process_pref_file_command(char *buf);
 extern errr process_pref_file(cptr name);
@@ -753,6 +756,7 @@ extern u32b counts_read(int where);
 /* flavor.c */
 extern void get_table_name(char *out_string);
 extern void flavor_init(void);
+extern char *object_desc_kosuu(char *t, object_type *o_ptr);
 extern void object_desc(char *buf, object_type *o_ptr, int pref, int mode);
 
 /* generate.c */
@@ -934,6 +938,7 @@ extern void remove_loc(void);
 
 /* spells1.c */
 extern bool in_disintegration_range(int y1, int x1, int y2, int x2);
+extern void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, bool disint_ball, bool real_breath);
 extern int take_hit(int damage_type, int damage, cptr kb_str, int monspell);
 extern u16b bolt_pict(int y, int x, int ny, int nx, int typ);
 extern sint project_path(u16b *gp, int range, int y1, int x1, int y2, int x2, int flg);
@@ -1488,7 +1493,7 @@ extern void strip_name(char *buf, int k_idx);
 extern bool compare_virtue(int type, int num, int tekitou);
 extern int virtue_number(int type);
 extern cptr virtue[MAX_VIRTUE];
-extern void get_virtues();
+extern void get_virtues(void);
 extern void chg_virtue(int virtue, int amount);
 extern void set_virtue(int virtue, int amount);
 extern void dump_virtues(FILE * OutFile);
@@ -1515,7 +1520,7 @@ extern cptr make_screen_dump(void);
 extern int soc_write(int sd, char *buf, size_t sz);
 extern int connect_scoreserver(void);
 extern int disconnect_server(int sd);
-extern char *soc_err(void);
+extern cptr soc_err(void);
 
 #ifdef CHUUKEI
 /* chuukei.c */

diff --git a/src/files.c b/src/files.c
index 96f409f..2da7a8b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2909,7 +2909,7 @@ static void player_vuln_flags(u32b *f1, u32b *f2, u32b *f3)
 /*
  * Helper function, see below
  */
-static void display_player_flag_aux(int row, int col, char *header,
+static void display_player_flag_aux(int row, int col, cptr header,
                                    int n, u32b flag1, u32b flag2,
                                    u32b im_f[], u32b vul_f)
 {

diff --git a/src/flavor.c b/src/flavor.c
index bc337cd..d4f5086 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -873,7 +873,7 @@ static char *object_desc_num(char *t, uint n)
  *¡Êcmd1.c ¤ÇήÍѤ¹¤ë¤¿¤á¤Ë object_desc_japanese ¤«¤é°ÜÆ°¤·¤¿¡£¡Ë
  */
 
-extern char *object_desc_kosuu(char *t, object_type *o_ptr)
+char *object_desc_kosuu(char *t, object_type *o_ptr)
 {
     t = object_desc_num(t, o_ptr->number);
 

diff --git a/src/h-system.h b/src/h-system.h
index ef79e54..cf1f29c 100644 (file)
--- a/src/h-system.h
+++ b/src/h-system.h
@@ -107,30 +107,7 @@
 #include <unistd.h>
 #endif /* __DJGPP__ */
 
-
-#ifdef SET_UID
-
-#ifdef USG
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strstr
-extern char *strstr();
-# endif
-# ifndef strchr
-extern char *strchr();
-# endif
-# ifndef strrchr
-extern char *strrchr();
-# endif
-#endif
-
-#else /* SET_UID */
-
-# include <string.h>
-
-#endif /* SET_UID */
-
+#include <string.h>
 
 #if !defined(linux) && !defined(__MWERKS__) && !defined(ACORN) && !defined(WIN32)
 extern long atol();

diff --git a/src/h-type.h b/src/h-type.h
index baa50e4..9f291de 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -148,21 +148,6 @@ typedef cptr *cptr_ptr;
 
 
 
-/*** Pointers to Functions with simple return types and any args ***/
-
-typedef void   (*func_void)();
-typedef errr   (*func_errr)();
-typedef char   (*func_char)();
-typedef byte   (*func_byte)();
-typedef bool   (*func_bool)();
-typedef sint   (*func_sint)();
-typedef uint   (*func_uint)();
-typedef real   (*func_real)();
-typedef vptr   (*func_vptr)();
-typedef cptr   (*func_cptr)();
-
-
-
 /*** Pointers to Functions of special types (for various purposes) ***/
 
 /* A generic function takes a user data and a special data */

diff --git a/src/inet.c b/src/inet.c
index 85fd3c5..585d730 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-static char    *errstr;
+static cptr errstr;
 static char    *proxy;
 static int     proxy_port;
 
@@ -100,7 +100,7 @@ int soc_read(int sd, char *buf, size_t sz)
 #endif /* if 0 */
 
 /* ¥×¥í¥­¥·¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤ò¤ò¥Õ¥¡¥¤¥ë¤«¤éÆɤó¤ÇÀßÄꤹ¤ë */
-static void set_proxy()
+static void set_proxy(void)
 {
        char buf[1024];
        size_t len;
@@ -120,7 +120,7 @@ static void set_proxy()
        if (!fp)
        {
                /* ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ïdefine.hÆâ¤Î¥Ç¥Õ¥©¥ë¥È¤òÀßÄê */
-               proxy = HTTP_PROXY;
+               proxy = (char *)HTTP_PROXY;
                proxy_port = HTTP_PROXY_PORT;
                return;
        }
@@ -228,7 +228,7 @@ static void (*sig_int_saved)(int);
 static void (*sig_alm_saved)(int);
 #endif
 
-static void restore_signal()
+static void restore_signal(void)
 {
 #if !defined(WINDOWS) && !defined(MACINTOSH)
        struct itimerval        val0;
@@ -508,8 +508,7 @@ int disconnect_server(int sd)
 #endif
 }
 
-char *
-soc_err()
+cptr soc_err()
 {
        return errstr;
 }

diff --git a/src/init1.c b/src/init1.c
index d367244..63c7d7b 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -7,7 +7,7 @@
 
 #ifdef JP
 #undef strchr
-char* _strchr(char* ptr, char ch)
+static char *_strchr(char *ptr, char ch)
 {
        for ( ; *ptr != '\0'; ++ptr)
        {
@@ -1073,7 +1073,7 @@ errr parse_m_info(char *buf, header *head)
 
 
                /* Scan for the values */
-               if (4 != sscanf(s, "%x:%d:%d:%d",
+               if (4 != sscanf(s, "%d:%d:%d:%d",
                                &xtra, &type, &first, &weight)) return (1);
 
                m_ptr->spell_xtra = xtra;
@@ -3840,7 +3840,7 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
        else
        {
                /* Accept all printables except spaces and brackets */
-               while (isprint(*s) && !strchr(" []", *s)) ++s;
+               while (isprint(*s) && !strchr((char *)" []", *s)) ++s;
 
                /* Extract final and Terminate */
                if ((f = *s) != '\0') *s++ = '\0';

diff --git a/src/kajitips.h b/src/kajitips.h
index f770498..92f2190 100644 (file)
--- a/src/kajitips.h
+++ b/src/kajitips.h
@@ -1,4 +1,4 @@
-static char *kaji_tips[5] =
+static cptr kaji_tips[5] =
 {
 #ifdef JP
        "¸½ºß»ý¤Ã¤Æ¤¤¤ë¥¨¥Ã¥»¥ó¥¹¤Î°ìÍ÷¤òɽ¼¨¤¹¤ë",

diff --git a/src/load.c b/src/load.c
index 88469a0..6a87454 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1107,7 +1107,7 @@ static void rd_ghost(void)
 /*
  * Save quick start data
  */
-void load_quick_start()
+static void load_quick_start(void)
 {
        byte tmp8u;
        int i;

diff --git a/src/main-gcu.c b/src/main-gcu.c
index 68cfaf5..b51b383 100644 (file)
--- a/src/main-gcu.c
+++ b/src/main-gcu.c
@@ -651,7 +651,7 @@ static bool check_file(cptr s)
 /*
  * Initialize sound
  */
-static bool init_sound()
+static bool init_sound(void)
 {
    /* Initialize once */
    if (!can_use_sound)

diff --git a/src/main-win.c b/src/main-win.c
index 124891f..37938bd 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -2634,13 +2634,6 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp)
 }
 
 
-#ifdef USE_TRANSPARENCY
-extern void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp);
-#else /* USE_TRANSPARENCY */
-extern void map_info(int y, int x, byte *ap, char *cp);
-#endif /* USE_TRANSPARENCY */
-
-
 static void windows_map(void)
 {
        term_data *td = &data[0];
@@ -3812,7 +3805,6 @@ static void process_menus(WORD wCmd)
 
                        if (GetSaveFileName(&ofn))
                        {
-                               extern void do_cmd_save_screen_html_aux(char *filename, int message);
                                do_cmd_save_screen_html_aux(buf, 0);
                        }
                        break;

diff --git a/src/main-x11.c b/src/main-x11.c
index 037e762..f0a2438 100644 (file)
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -2257,7 +2257,7 @@ static bool check_file(cptr s)
 /*
  * Initialize sound
  */
-static void init_sound()
+static void init_sound(void)
 {
        int i;
        char wav[128];

diff --git a/src/mane.c b/src/mane.c
index 9886860..eeef765 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -15,7 +15,7 @@
 
 static int damage;
 
-void mane_info(char *p, int power, int dam)
+static void mane_info(char *p, int power, int dam)
 {
        int plev = p_ptr->lev;
 #ifdef JP

diff --git a/src/melee1.c b/src/melee1.c
index d4482b4..1fe8f66 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -12,7 +12,6 @@
 
 #include "angband.h"
 
-extern cptr silly_attacks[MAX_SILLY_ATTACK];
 
 /*
  * Critical blow.  All hits that do 95% of total possible damage,

diff --git a/src/melee2.c b/src/melee2.c
index a68ad93..ee3833e 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -21,8 +21,6 @@
 #define GRINDNOISE 20
 #define CYBERNOISE 20
 
-extern cptr silly_attacks[MAX_SILLY_ATTACK];
-
 /*
  * Calculate the direction to the next enemy
  */

diff --git a/src/mindtips.h b/src/mindtips.h
index 190c5af..d55534d 100644 (file)
--- a/src/mindtips.h
+++ b/src/mindtips.h
@@ -1,5 +1,5 @@
 #ifdef JP
-static char *mind_tips[5][MAX_MIND_POWERS] =
+static cptr mind_tips[5][MAX_MIND_POWERS] =
 {
 {
        "¶á¤¯¤ÎÁ´¤Æ¤Î¸«¤¨¤ë¥â¥ó¥¹¥¿¡¼¤ò´¶ÃΤ¹¤ë¡£¥ì¥Ù¥ë5¤Çæ«/Èâ¡¢15¤ÇÆ©ÌÀ¤Ê¥â¥ó¥¹¥¿¡¼¡¢30¤ÇºâÊõ¤È¥¢¥¤¥Æ¥à¤ò´¶ÃΤǤ­¤ë¤è¤¦¤Ë¤Ê¤ë¡£¥ì¥Ù¥ë20¤Ç¼þÊÕ¤ÎÃÏ·Á¤ò´¶ÃΤ·¡¢45¤Ç¤½¤Î³¬Á´ÂΤò±Êµ×¤Ë¾È¤é¤·¡¢¥À¥ó¥¸¥ç¥óÆâ¤Î¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤ò´¶ÃΤ¹¤ë¡£¥ì¥Ù¥ë25¤Ç°ìÄê»þ´Ö¥Æ¥ì¥Ñ¥·¡¼¤òÆÀ¤ë¡£",
@@ -118,7 +118,7 @@ static char *mind_tips[5][MAX_MIND_POWERS] =
 },
 };
 #else
-static char *mind_tips[5][MAX_MIND_POWERS] =
+static cptr mind_tips[5][MAX_MIND_POWERS] =
 {
 {
        "detects visible monsters in the neighborhood and more and more. detects traps and doors at level 5, invisible monsters at level 15, items at level 30. And magic mapping at level 20. lights and know the whole level at level 45. gives telepathy at level 25",

diff --git a/src/monster1.c b/src/monster1.c
index 1b48c24..0039ec9 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -3243,7 +3243,7 @@ bool monster_shore(int r_idx)
 }
 
 
-bool monster_waste(int r_idx)
+static bool monster_waste(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -3561,183 +3561,3 @@ bool monster_living(monster_race *r_ptr)
        else
                return TRUE;
 }
-
-
-
-/* Dwarves */
-static char *dwarf_syllable1[] =
-{
-       "B", "D", "F", "G", "Gl", "H", "K", "L", "M", "N", "R", "S", "T", "Th", "V",
-};
-
-static char *dwarf_syllable2[] =
-{
-       "a", "e", "i", "o", "oi", "u",
-};
-
-static char *dwarf_syllable3[] =
-{
-       "bur", "fur", "gan", "gnus", "gnar", "li", "lin", "lir", "mli", "nar",
-       "nus", "rin", "ran", "sin", "sil", "sur",
-};
-
-/* Elves */
-static char *elf_syllable1[] =
-{
-       "Al", "An", "Bal", "Bel", "Cal", "Cel", "El", "Elr", "Elv", "Eow", "F",
-       "Fal", "Fel", "Fin", "G", "Gal", "Gel", "Gl", "Is", "Lan", "Leg", "N",
-       "Nal", "Nel",  "S", "Sal", "Sel", "T", "Tal", "Tel", "Thr", "Tin",
-};
-
-static char *elf_syllable2[] =
-{
-       "a", "adrie", "ara", "e", "ebri", "ele", "ere", "i", "io", "ithra",
-       "ilma", "il-Ga", "ili", "o", "orfi", "u", "y",
-};
-
-static char *elf_syllable3[] =
-{
-       "l", "las", "lad", "ldor", "ldur", "linde", "lith", "mir", "n", "nd",
-       "ndel", "ndil", "ndir", "nduil", "ng", "mbor", "r", "rith", "ril",
-       "riand", "rion", "s", "thien", "viel", "wen", "wyn",
-};
-
-/* Gnomes */
-static char *gnome_syllable1[] =
-{
-       "Aar", "An", "Ar", "As", "C", "H", "Han", "Har", "Hel", "Iir", "J",
-       "Jan", "Jar", "K", "L", "M", "Mar", "N", "Nik", "Os", "Ol", "P", "R",
-       "S", "Sam", "San", "T", "Ter", "Tom", "Ul", "V", "W", "Y",
-};
-
-static char *gnome_syllable2[] =
-{
-       "a", "aa",  "ai", "e", "ei", "i", "o", "uo", "u", "uu",
-};
-
-static char *gnome_syllable3[] =
-{
-       "ron", "re", "la", "ki", "kseli", "ksi", "ku", "ja", "ta", "na",
-       "namari", "neli", "nika", "nikki", "nu", "nukka", "ka", "ko", "li",
-       "kki", "rik", "po", "to", "pekka", "rjaana", "rjatta", "rjukka", "la",
-       "lla", "lli", "mo", "nni",
-};
-
-/* Hobbit */
-static char *hobbit_syllable1[] =
-{
-       "B", "Ber", "Br", "D", "Der", "Dr", "F", "Fr", "G", "H", "L", "Ler",
-       "M", "Mer", "N", "P", "Pr", "Per", "R", "S", "T", "W",
-};
-
-static char *hobbit_syllable2[] =
-{
-       "a", "e", "i", "ia", "o", "oi", "u",
-};
-
-static char *hobbit_syllable3[] =
-{
-       "bo", "ck", "decan", "degar", "do", "doc", "go", "grin", "lba", "lbo",
-       "lda", "ldo", "lla", "ll", "lo", "m", "mwise", "nac", "noc", "nwise",
-       "p", "ppin", "pper", "tho", "to",
-};
-
-/* Human */
-static char *human_syllable1[] =
-{
-       "Ab", "Ac", "Ad", "Af", "Agr", "Ast", "As", "Al", "Adw", "Adr", "Ar",
-       "B", "Br", "C", "Cr", "Ch", "Cad", "D", "Dr", "Dw", "Ed", "Eth", "Et",
-       "Er", "El", "Eow", "F", "Fr", "G", "Gr", "Gw", "Gal", "Gl", "H", "Ha",
-       "Ib", "Jer", "K", "Ka", "Ked", "L", "Loth", "Lar", "Leg", "M", "Mir",
-       "N", "Nyd", "Ol", "Oc", "On", "P", "Pr", "R", "Rh", "S", "Sev", "T",
-       "Tr", "Th", "V", "Y", "Z", "W", "Wic",
-};
-
-static char *human_syllable2[] =
-{
-       "a", "ae", "au", "ao", "are", "ale", "ali", "ay", "ardo", "e", "ei",
-       "ea", "eri", "era", "ela", "eli", "enda", "erra", "i", "ia", "ie",
-       "ire", "ira", "ila", "ili", "ira", "igo", "o", "oa", "oi", "oe",
-       "ore", "u", "y",
-};
-
-static char *human_syllable3[] =
-{
-       "a", "and", "b", "bwyn", "baen", "bard", "c", "ctred", "cred", "ch",
-       "can", "d", "dan", "don", "der", "dric", "dfrid", "dus", "f", "g",
-       "gord", "gan", "l", "li", "lgrin", "lin", "lith", "lath", "loth", "ld",
-       "ldric", "ldan", "m", "mas", "mos", "mar", "mond", "n", "nydd", "nidd",
-       "nnon", "nwan", "nyth", "nad", "nn", "nnor", "nd", "p", "r", "ron",
-       "rd", "s", "sh", "seth", "sean", "t", "th", "tha", "tlan", "trem",
-       "tram", "v", "vudd", "w", "wan", "win", "wyn", "wyr", "wyr", "wyth",
-};
-
-/* Orc */
-static char *orc_syllable1[] =
-{
-       "B", "Er", "G", "Gr", "H", "P", "Pr", "R", "V", "Vr", "T", "Tr", "M", "Dr",
-};
-
-static char *orc_syllable2[] =
-{
-       "a", "i", "o", "oo", "u", "ui",
-};
-
-static char *orc_syllable3[] =
-{
-       "dash", "dish", "dush", "gar", "gor", "gdush", "lo", "gdish", "k",
-       "lg", "nak", "rag", "rbag", "rg", "rk", "ng", "nk", "rt", "ol", "urk",
-       "shnak", "mog", "mak", "rak",
-};
-
-
-/*
- * Random Name Generator
- * based on a Javascript by Michael Hensley
- * "http://geocities.com/timessquare/castle/6274/"
- */
-void create_name(int type, char *name)
-{
-       /* Paranoia */
-       if (!name) return;
-
-       /* Select the monster type */
-       switch (type)
-       {
-               /* Create the monster name */
-               case NAME_DWARF:
-                       strcpy(name, dwarf_syllable1[randint0(sizeof(dwarf_syllable1) / sizeof(char*))]);
-                       strcat(name, dwarf_syllable2[randint0(sizeof(dwarf_syllable2) / sizeof(char*))]);
-                       strcat(name, dwarf_syllable3[randint0(sizeof(dwarf_syllable3) / sizeof(char*))]);
-                       break;
-               case NAME_ELF:
-                       strcpy(name, elf_syllable1[randint0(sizeof(elf_syllable1) / sizeof(char*))]);
-                       strcat(name, elf_syllable2[randint0(sizeof(elf_syllable2) / sizeof(char*))]);
-                       strcat(name, elf_syllable3[randint0(sizeof(elf_syllable3) / sizeof(char*))]);
-                       break;
-               case NAME_GNOME:
-                       strcpy(name, gnome_syllable1[randint0(sizeof(gnome_syllable1) / sizeof(char*))]);
-                       strcat(name, gnome_syllable2[randint0(sizeof(gnome_syllable2) / sizeof(char*))]);
-                       strcat(name, gnome_syllable3[randint0(sizeof(gnome_syllable3) / sizeof(char*))]);
-                       break;
-               case NAME_HOBBIT:
-                       strcpy(name, hobbit_syllable1[randint0(sizeof(hobbit_syllable1) / sizeof(char*))]);
-                       strcat(name, hobbit_syllable2[randint0(sizeof(hobbit_syllable2) / sizeof(char*))]);
-                       strcat(name, hobbit_syllable3[randint0(sizeof(hobbit_syllable3) / sizeof(char*))]);
-                       break;
-               case NAME_HUMAN:
-                       strcpy(name, human_syllable1[randint0(sizeof(human_syllable1) / sizeof(char*))]);
-                       strcat(name, human_syllable2[randint0(sizeof(human_syllable2) / sizeof(char*))]);
-                       strcat(name, human_syllable3[randint0(sizeof(human_syllable3) / sizeof(char*))]);
-                       break;
-               case NAME_ORC:
-                       strcpy(name, orc_syllable1[randint0(sizeof(orc_syllable1) / sizeof(char*))]);
-                       strcat(name, orc_syllable2[randint0(sizeof(orc_syllable2) / sizeof(char*))]);
-                       strcat(name, orc_syllable3[randint0(sizeof(orc_syllable3) / sizeof(char*))]);
-                       break;
-               /* Create an empty name */
-               default:
-                       name[0] = '\0';
-                       break;
-       }
-}

diff --git a/src/mspells2.c b/src/mspells2.c
index 9e31390..314fdcc 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -59,7 +59,7 @@ static void monst_beam_monst(int m_idx, int y, int x, int typ, int dam_hp, int m
 /*
  * Determine if a beam spell will hit the target.
  */
-bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
+static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
 {
        bool hit2 = FALSE;
        int i, y, x;
@@ -106,8 +106,6 @@ static bool breath_direct(int y1, int x1, int y2, int x2, int rad, bool disint_b
        int grid_n = 0;
        u16b grid_g[512];
 
-       void breath_shape(u16b *path_g, int dist, int *pgrids, byte *gx, byte *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, bool disint_ball, bool real_breath);
-
        int grids = 0;
        byte gx[1024], gy[1024];
        byte gm[32];

diff --git a/src/mspells3.c b/src/mspells3.c
index c24d6ac..28e5671 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -14,7 +14,7 @@
 
 #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130)
 
-void learned_info(char *p, int power)
+static void learned_info(char *p, int power)
 {
        int plev = pseudo_plev();
        int hp = p_ptr->chp;

diff --git a/src/obj_kind.c b/src/obj_kind.c
index 003351b..e8dbe45 100644 (file)
--- a/src/obj_kind.c
+++ b/src/obj_kind.c
@@ -244,50 +244,6 @@ cptr get_object_name(object_type *o_ptr)
 }
 
 
-/* Default object attribute */
-byte get_object_d_attr(object_type *o_ptr)
-{
-#if 0
-       return get_object_d_attr_callback(o_ptr);
-#else
-       return k_info[o_ptr->k_idx].d_attr;
-#endif
-}
-
-
-/* Default object character */
-byte get_object_x_attr(object_type *o_ptr)
-{
-#if 0
-       return get_object_x_attr_callback(o_ptr);
-#else
-       return k_info[o_ptr->k_idx].x_attr;
-#endif
-}
-
-
-/* Desired object attribute */
-char get_object_d_char(object_type *o_ptr)
-{
-#if 0
-       return get_object_d_char_callback(o_ptr);
-#else
-       return k_info[o_ptr->k_idx].d_char;
-#endif
-}
-
-
-/* Desired object character */
-char get_object_x_char(object_type *o_ptr)
-{
-#if 0
-       return get_object_x_char_callback(o_ptr);
-#else
-       return k_info[o_ptr->k_idx].x_char;
-#endif
-}
-
-
 /* The player is "aware" of the item's effects */
 bool get_object_aware(object_type *o_ptr)
 {

diff --git a/src/object1.c b/src/object1.c
index b4afd05..0ef6109 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -7303,7 +7303,7 @@ if (ver && !verify("
 }
 
 
-bool py_pickup_floor_aux(void)
+static bool py_pickup_floor_aux(void)
 {
        s16b this_o_idx;
 

diff --git a/src/object2.c b/src/object2.c
index da75246..cfd7f71 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -1530,7 +1530,7 @@ void reduce_charges(object_type *o_ptr, int amt)
 /*
  *  Determine if an item can partly absorb a second item.
  */
-bool object_similar_part(object_type *o_ptr, object_type *j_ptr)
+static bool object_similar_part(object_type *o_ptr, object_type *j_ptr)
 {
        /* Require identical object types */
        if (o_ptr->k_idx != j_ptr->k_idx) return (0);
@@ -6640,7 +6640,7 @@ static essence_type essence_info[MAX_ESSENCE] = {
 };
 #endif
 
-bool item_tester_hook_melee_ammo(object_type *o_ptr)
+static bool item_tester_hook_melee_ammo(object_type *o_ptr)
 {
        switch (o_ptr->tval)
        {
@@ -6916,7 +6916,7 @@ static void drain_essence(void)
 
 
 
-static int choose_essence()
+static int choose_essence(void)
 {
        int mode = 0;
        char choice;
@@ -7620,7 +7620,7 @@ static void add_essence(int mode)
 }
 
 
-bool item_tester_hook_kaji(object_type *o_ptr)
+static bool item_tester_hook_kaji(object_type *o_ptr)
 {
        switch (o_ptr->tval)
        {
@@ -7650,7 +7650,7 @@ bool item_tester_hook_kaji(object_type *o_ptr)
 }
 
 
-void erase_essence(void)
+static void erase_essence(void)
 {
        int item;
        cptr q, s;

diff --git a/src/report.c b/src/report.c
index a483080..a9a585e 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -193,7 +193,7 @@ static BUF * buf_subbuf(BUF *buf, int pos1, size_t sz)
 }
 #endif
 
-static void http_post(int sd, char *url, BUF *buf)
+static void http_post(int sd, cptr url, BUF *buf)
 {
        BUF *output;
 
@@ -215,8 +215,6 @@ static void http_post(int sd, char *url, BUF *buf)
 /* ¥­¥ã¥é¥¯¥¿¥À¥ó¥×¤òºî¤Ã¤Æ BUF¤ËÊݸ */
 static errr make_dump(BUF* dumpbuf)
 {
-       errr make_character_dump(FILE *fff);
-
        char            buf[1024];
        FILE *fff;
        char file_name[1024];
@@ -270,12 +268,12 @@ cptr make_screen_dump(void)
        byte a = 0, old_a = 0;
        char c = ' ';
 
-       static char *html_head[] = {
+       static cptr html_head[] = {
                "<html>\n<body text=\"#ffffff\" bgcolor=\"#000000\">\n",
                "<pre>",
                0,
        };
-       static char *html_foot[] = {
+       static cptr html_foot[] = {
                "</pre>\n",
                "</body>\n</html>\n",
                0,
@@ -317,7 +315,7 @@ cptr make_screen_dump(void)
                for (x = 0; x < wid - 1; x++)
                {
                        int rv, gv, bv;
-                       char *cc = NULL;
+                       cptr cc = NULL;
                        /* Get the attr/char */
                        (void)(Term_what(x, y, &a, &c));
 

diff --git a/src/save.c b/src/save.c
index cdb5663..eac50f1 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -890,7 +890,7 @@ static void wr_ghost(void)
 /*
  * Save quick start data
  */
-void save_quick_start()
+static void save_quick_start(void)
 {
        int i;
 

diff --git a/src/spells2.c b/src/spells2.c
index ca0cc65..c4cdeab 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4976,7 +4976,7 @@ bool probing(void)
        int cu, cv;
        bool    probe = FALSE;
        char buf[256];
-       char *align;
+       cptr align;
 
        cu = Term->scr->cu;
        cv = Term->scr->cv;

diff --git a/src/spells3.c b/src/spells3.c
index 91d92ca..c24a751 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1139,7 +1139,7 @@ msg_print("
 }
 
 
-bool item_tester_hook_weapon_nobow(object_type *o_ptr)
+static bool item_tester_hook_weapon_nobow(object_type *o_ptr)
 {
        switch (o_ptr->tval)
        {
@@ -2051,7 +2051,7 @@ bool item_tester_hook_weapon(object_type *o_ptr)
        return (FALSE);
 }
 
-bool item_tester_hook_weapon2(object_type *o_ptr)
+static bool item_tester_hook_weapon2(object_type *o_ptr)
 {
        switch (o_ptr->tval)
        {
@@ -2097,7 +2097,7 @@ bool item_tester_hook_armour(object_type *o_ptr)
 }
 
 
-bool item_tester_hook_corpse(object_type *o_ptr)
+static bool item_tester_hook_corpse(object_type *o_ptr)
 {
        switch (o_ptr->tval)
        {
@@ -2147,7 +2147,7 @@ bool item_tester_hook_weapon_armour(object_type *o_ptr)
 /*
  * Check if an object is nameless weapon or armour
  */
-bool item_tester_hook_nameless_weapon_armour(object_type *o_ptr)
+static bool item_tester_hook_nameless_weapon_armour(object_type *o_ptr)
 {
        if (o_ptr->name1 || o_ptr->art_name || o_ptr->name2 || o_ptr->xtra3)
                return FALSE;
@@ -2592,12 +2592,12 @@ bool identify_item(object_type *o_ptr)
 }
 
 
-bool item_tester_hook_identify(object_type *o_ptr)
+static bool item_tester_hook_identify(object_type *o_ptr)
 {
        return (bool)!object_known_p(o_ptr);
 }
 
-bool item_tester_hook_identify_weapon_armour(object_type *o_ptr)
+static bool item_tester_hook_identify_weapon_armour(object_type *o_ptr)
 {
        if (object_known_p(o_ptr))
                return FALSE;
@@ -2769,12 +2769,12 @@ msg_print("
 
 
 
-bool item_tester_hook_identify_fully(object_type *o_ptr)
+static bool item_tester_hook_identify_fully(object_type *o_ptr)
 {
        return (bool)(!object_known_p(o_ptr) || !(o_ptr->ident & IDENT_MENTAL));
 }
 
-bool item_tester_hook_identify_fully_weapon_armour(object_type *o_ptr)
+static bool item_tester_hook_identify_fully_weapon_armour(object_type *o_ptr)
 {
        if (!item_tester_hook_identify_fully(o_ptr))
                return FALSE;

diff --git a/src/spellstips.h b/src/spellstips.h
index 8c2cc85..13bd73a 100644 (file)
--- a/src/spellstips.h
+++ b/src/spellstips.h
@@ -1,5 +1,5 @@
 #ifdef JP
-static char *spell_tips[VALID_REALM][32] =
+static cptr spell_tips[VALID_REALM][32] =
 {
        {
                "²ø²æ¤ÈÂÎÎϤò¾¯¤·²óÉü¤µ¤»¤ë¡£",
@@ -458,7 +458,7 @@ static char *spell_tips[VALID_REALM][32] =
        },
 };
 #else
-static char *spell_tips[VALID_REALM][32] =
+static cptr spell_tips[VALID_REALM][32] =
 {
        {
                "heals cut and HP a little.",

diff --git a/src/util.c b/src/util.c
index 409a08d..e4c3fec 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -91,10 +91,12 @@ int usleep(huge usecs)
 
 
 /*
-* Hack -- External functions
-*/
-extern struct passwd *getpwuid();
-extern struct passwd *getpwnam();
+ * Hack -- External functions
+ */
+#ifdef SET_UID
+extern struct passwd *getpwuid(uid_t uid);
+extern struct passwd *getpwnam(const char *name);
+#endif
 
 
 /*
@@ -791,9 +793,6 @@ errr fd_seek(int fd, huge n)
        p = lseek(fd, n, SEEK_SET);
 
        /* Failure */
-       if (p < 0) return (1);
-
-       /* Failure */
        if (p != n) return (1);
 
        /* Success */
@@ -1260,7 +1259,7 @@ void text_to_ascii(char *buf, cptr str)
 }
 
 
-bool trigger_ascii_to_text(char **bufptr, cptr *strptr)
+static bool trigger_ascii_to_text(char **bufptr, cptr *strptr)
 {
        char *s = *bufptr;
        cptr str = *strptr;
@@ -1610,21 +1609,6 @@ errr macro_add(cptr pat, cptr act)
 
 
 /*
- * Initialize the "macro" package
- */
-errr macro_init(void)
-{
-       /* Macro patterns */
-       C_MAKE(macro__pat, MACRO_MAX, cptr);
-
-       /* Macro actions */
-       C_MAKE(macro__act, MACRO_MAX, cptr);
-
-       /* Success */
-       return (0);
-}
-
-/*
  * Local variable -- we are inside a "macro action"
  *
  * Do not match any macros until "ascii 30" is found.

diff --git a/src/wild.c b/src/wild.c
index d23b7f6..7d4926e 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -428,7 +428,7 @@ static int terrain_table[MAX_WILDERNESS][18] =
 };
 
 
-void generate_wilderness_area(int terrain, u32b seed, bool border, bool corner)
+static void generate_wilderness_area(int terrain, u32b seed, bool border, bool corner)
 {
        int x1, y1;
        int table_size = sizeof(terrain_table[0]) / sizeof(int);

diff --git a/src/wizard1.c b/src/wizard1.c
index 566c6ae..8367d76 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -1905,7 +1905,7 @@ static void spoil_out(cptr str)
 /*
  *  Hook function used in spoil_mon_info()
  */
-void roff_func(byte attr, cptr str)
+static void roff_func(byte attr, cptr str)
 {
        spoil_out(str);
 }

diff --git a/src/wizard2.c b/src/wizard2.c
index 8e4989e..c40c14c 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -981,7 +981,7 @@ static void wiz_statistics(object_type *o_ptr)
        u32b test_roll = 1000000;
 
        char ch;
-       char *quality;
+       cptr quality;
 
        bool good, great;