From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 18 Oct 2001 04:04:34 +0000 (-0000)
Subject: Fix a nasty bug with variable name shadowing
X-Git-Tag: 0_60_2~124
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11fdb8a4c79752157a8263fbcf583916d5ec0347;p=oweals%2Fbusybox.git

Fix a nasty bug with variable name shadowing
---

diff --git a/halt.c b/halt.c
index a6fec021b..d66e28d0e 100644
--- a/halt.c
+++ b/halt.c
@@ -30,7 +30,7 @@ extern int halt_main(int argc, char **argv)
 	/* don't assume init's pid == 1 */
 	pid_t *pid = find_pid_by_name("init");
 	if (!pid || *pid<=0) {
-		pid_t *pid = find_pid_by_name("linuxrc");
+		pid = find_pid_by_name("linuxrc");
 		if (!pid || *pid<=0)
 			error_msg_and_die("no process killed");
 	}
diff --git a/init/halt.c b/init/halt.c
index a6fec021b..d66e28d0e 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -30,7 +30,7 @@ extern int halt_main(int argc, char **argv)
 	/* don't assume init's pid == 1 */
 	pid_t *pid = find_pid_by_name("init");
 	if (!pid || *pid<=0) {
-		pid_t *pid = find_pid_by_name("linuxrc");
+		pid = find_pid_by_name("linuxrc");
 		if (!pid || *pid<=0)
 			error_msg_and_die("no process killed");
 	}
diff --git a/init/poweroff.c b/init/poweroff.c
index eba51342c..db20a4572 100644
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -30,7 +30,7 @@ extern int poweroff_main(int argc, char **argv)
 	/* don't assume init's pid == 1 */
 	pid_t *pid = find_pid_by_name("init");
 	if (!pid || *pid<=0) {
-		pid_t *pid = find_pid_by_name("linuxrc");
+		pid = find_pid_by_name("linuxrc");
 		if (!pid || *pid<=0)
 			error_msg_and_die("no process killed");
 	}
diff --git a/init/reboot.c b/init/reboot.c
index bdcd443eb..35afd74ff 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -30,7 +30,7 @@ extern int reboot_main(int argc, char **argv)
 	/* don't assume init's pid == 1 */
 	pid_t *pid = find_pid_by_name("init");
 	if (!pid || *pid<=0) {
-		pid_t *pid = find_pid_by_name("linuxrc");
+		pid = find_pid_by_name("linuxrc");
 		if (!pid || *pid<=0)
 			error_msg_and_die("no process killed");
 	}
diff --git a/poweroff.c b/poweroff.c
index eba51342c..db20a4572 100644
--- a/poweroff.c
+++ b/poweroff.c
@@ -30,7 +30,7 @@ extern int poweroff_main(int argc, char **argv)
 	/* don't assume init's pid == 1 */
 	pid_t *pid = find_pid_by_name("init");
 	if (!pid || *pid<=0) {
-		pid_t *pid = find_pid_by_name("linuxrc");
+		pid = find_pid_by_name("linuxrc");
 		if (!pid || *pid<=0)
 			error_msg_and_die("no process killed");
 	}
diff --git a/reboot.c b/reboot.c
index bdcd443eb..35afd74ff 100644
--- a/reboot.c
+++ b/reboot.c
@@ -30,7 +30,7 @@ extern int reboot_main(int argc, char **argv)
 	/* don't assume init's pid == 1 */
 	pid_t *pid = find_pid_by_name("init");
 	if (!pid || *pid<=0) {
-		pid_t *pid = find_pid_by_name("linuxrc");
+		pid = find_pid_by_name("linuxrc");
 		if (!pid || *pid<=0)
 			error_msg_and_die("no process killed");
 	}