emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a nasty bug with variable name shadowing

Browse Source
This commit is contained in:
Eric Andersen 2001-10-18 04:04:34 +00:00
parent 1bf25f0307
commit 11fdb8a4c7
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
halt.c
View File

@ -30,7 +30,7 @@ extern int halt_main(int argc, char **argv)
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
pid_t *pid = find_pid_by_name("init"); pid_t *pid = find_pid_by_name("init");
if (!pid || *pid<=0) { if (!pid || *pid<=0) {
pid_t *pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0) if (!pid || *pid<=0)
error_msg_and_die("no process killed"); error_msg_and_die("no process killed");
} }

2
init/halt.c
View File

@ -30,7 +30,7 @@ extern int halt_main(int argc, char **argv)
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
pid_t *pid = find_pid_by_name("init"); pid_t *pid = find_pid_by_name("init");
if (!pid || *pid<=0) { if (!pid || *pid<=0) {
pid_t *pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0) if (!pid || *pid<=0)
error_msg_and_die("no process killed"); error_msg_and_die("no process killed");
} }

2
init/poweroff.c
View File

@ -30,7 +30,7 @@ extern int poweroff_main(int argc, char **argv)
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
pid_t *pid = find_pid_by_name("init"); pid_t *pid = find_pid_by_name("init");
if (!pid || *pid<=0) { if (!pid || *pid<=0) {
pid_t *pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0) if (!pid || *pid<=0)
error_msg_and_die("no process killed"); error_msg_and_die("no process killed");
} }

2
init/reboot.c
View File

@ -30,7 +30,7 @@ extern int reboot_main(int argc, char **argv)
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
pid_t *pid = find_pid_by_name("init"); pid_t *pid = find_pid_by_name("init");
if (!pid || *pid<=0) { if (!pid || *pid<=0) {
pid_t *pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0) if (!pid || *pid<=0)
error_msg_and_die("no process killed"); error_msg_and_die("no process killed");
} }

2
poweroff.c
View File

@ -30,7 +30,7 @@ extern int poweroff_main(int argc, char **argv)
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
pid_t *pid = find_pid_by_name("init"); pid_t *pid = find_pid_by_name("init");
if (!pid || *pid<=0) { if (!pid || *pid<=0) {
pid_t *pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0) if (!pid || *pid<=0)
error_msg_and_die("no process killed"); error_msg_and_die("no process killed");
} }

2
reboot.c
View File

@ -30,7 +30,7 @@ extern int reboot_main(int argc, char **argv)
/* don't assume init's pid == 1 */ /* don't assume init's pid == 1 */
pid_t *pid = find_pid_by_name("init"); pid_t *pid = find_pid_by_name("init");
if (!pid || *pid<=0) { if (!pid || *pid<=0) {
pid_t *pid = find_pid_by_name("linuxrc"); pid = find_pid_by_name("linuxrc");
if (!pid || *pid<=0) if (!pid || *pid<=0)
error_msg_and_die("no process killed"); error_msg_and_die("no process killed");
} }