aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-10-18 04:04:34 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-10-18 04:04:34 +0000
commiteda2808ef7c3ab579bfc23b67878b4ee3c4fd6f9 (patch)
treea59376401e4f839f9cbd8538bd7caa2d0dd3658f /init
parentc4de7b7fbd6fe1d1b083920a58a0e4f8609ab624 (diff)
downloadbusybox-w32-eda2808ef7c3ab579bfc23b67878b4ee3c4fd6f9.tar.gz
busybox-w32-eda2808ef7c3ab579bfc23b67878b4ee3c4fd6f9.tar.bz2
busybox-w32-eda2808ef7c3ab579bfc23b67878b4ee3c4fd6f9.zip
Fix a nasty bug with variable name shadowing
git-svn-id: svn://busybox.net/trunk/busybox@3537 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'init')
-rw-r--r--init/halt.c2
-rw-r--r--init/poweroff.c2
-rw-r--r--init/reboot.c2
3 files changed, 3 insertions, 3 deletions
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)
30 /* don't assume init's pid == 1 */ 30 /* don't assume init's pid == 1 */
31 pid_t *pid = find_pid_by_name("init"); 31 pid_t *pid = find_pid_by_name("init");
32 if (!pid || *pid<=0) { 32 if (!pid || *pid<=0) {
33 pid_t *pid = find_pid_by_name("linuxrc"); 33 pid = find_pid_by_name("linuxrc");
34 if (!pid || *pid<=0) 34 if (!pid || *pid<=0)
35 error_msg_and_die("no process killed"); 35 error_msg_and_die("no process killed");
36 } 36 }
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)
30 /* don't assume init's pid == 1 */ 30 /* don't assume init's pid == 1 */
31 pid_t *pid = find_pid_by_name("init"); 31 pid_t *pid = find_pid_by_name("init");
32 if (!pid || *pid<=0) { 32 if (!pid || *pid<=0) {
33 pid_t *pid = find_pid_by_name("linuxrc"); 33 pid = find_pid_by_name("linuxrc");
34 if (!pid || *pid<=0) 34 if (!pid || *pid<=0)
35 error_msg_and_die("no process killed"); 35 error_msg_and_die("no process killed");
36 } 36 }
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)
30 /* don't assume init's pid == 1 */ 30 /* don't assume init's pid == 1 */
31 pid_t *pid = find_pid_by_name("init"); 31 pid_t *pid = find_pid_by_name("init");
32 if (!pid || *pid<=0) { 32 if (!pid || *pid<=0) {
33 pid_t *pid = find_pid_by_name("linuxrc"); 33 pid = find_pid_by_name("linuxrc");
34 if (!pid || *pid<=0) 34 if (!pid || *pid<=0)
35 error_msg_and_die("no process killed"); 35 error_msg_and_die("no process killed");
36 } 36 }