From 68fbe51bccdceba8a1713b1824a00cfc37726111 Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Mon, 26 Jun 2017 23:54:14 +0900
Subject: [PATCH 1/1] =?utf8?q?#37287=20cmd4.c=E3=81=A8cmd5.c=E3=80=81cmd6.?=
 =?utf8?q?c=E5=86=85=E3=81=AEC4457=E8=AD=A6=E5=91=8A=E3=81=AB=E5=AF=BE?=
 =?utf8?q?=E5=BF=9C=E3=80=82=20/=20Deal=20C4457=20warning=20in=20cmd4.c,?=
 =?utf8?q?=20cmd5.c=E3=80=80and=20cmd6.c.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd4.c | 7 +------
 src/cmd5.c | 4 ----
 src/cmd6.c | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/cmd4.c b/src/cmd4.c
index 7db484710..16e0464f5 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -1858,14 +1858,10 @@ void do_cmd_options_aux(int page, cptr info)
 static void do_cmd_options_win(void)
 {
 	int i, j, d;
-
 	int y = 0;
 	int x = 0;
-
 	char ch;
-
 	bool go = TRUE;
-
 	u32b old_flag[8];
 
 
@@ -1919,9 +1915,8 @@ static void do_cmd_options_win(void)
 			/* Display the windows */
 			for (j = 0; j < 8; j++)
 			{
-				byte a = TERM_WHITE;
-
 				char c = '.';
+				a = TERM_WHITE;
 
 				/* Use color */
 				if ((i == y) && (j == x)) a = TERM_L_BLUE;
diff --git a/src/cmd5.c b/src/cmd5.c
index 872fcaf21..ea9ca3325 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -2176,8 +2176,6 @@ static void do_name_pet(void)
 				m_ptr->nickname = quark_add(out_val);
 				if (record_named_pet)
 				{
-					char m_name[80];
-
 					monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 					do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);
 				}
@@ -2186,8 +2184,6 @@ static void do_name_pet(void)
 			{
 				if (record_named_pet && old_name)
 				{
-					char m_name[80];
-
 					monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 					do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);
 				}
diff --git a/src/cmd6.c b/src/cmd6.c
index 4d21d6b53..cc125d578 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -3835,7 +3835,7 @@ static void do_cmd_activate_aux(int item)
 		}
 		else
 		{
-			bool success = FALSE;
+			success = FALSE;
 			if (!get_rep_dir2(&dir)) return;
 			if (monster_can_enter(p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], &r_info[o_ptr->pval], 0))
 			{
-- 
2.11.0