From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 18 Oct 2001 04:05:28 +0000 (-0000)
Subject: Fix a nasty bug resulting from variable name shadowing
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=62fda9612070cd578f4225e7e924b64beaf82700;p=oweals%2Fbusybox.git

Fix a nasty bug resulting from variable name shadowing
---

diff --git a/busybox/halt.c b/busybox/halt.c
index a6fec021b..d66e28d0e 100644
--- a/busybox/halt.c
+++ b/busybox/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/busybox/init/halt.c b/busybox/init/halt.c
index a6fec021b..d66e28d0e 100644
--- a/busybox/init/halt.c
+++ b/busybox/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/busybox/init/poweroff.c b/busybox/init/poweroff.c
index eba51342c..db20a4572 100644
--- a/busybox/init/poweroff.c
+++ b/busybox/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/busybox/init/reboot.c b/busybox/init/reboot.c
index bdcd443eb..35afd74ff 100644
--- a/busybox/init/reboot.c
+++ b/busybox/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/busybox/poweroff.c b/busybox/poweroff.c
index eba51342c..db20a4572 100644
--- a/busybox/poweroff.c
+++ b/busybox/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/busybox/reboot.c b/busybox/reboot.c
index bdcd443eb..35afd74ff 100644
--- a/busybox/reboot.c
+++ b/busybox/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");
 	}