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

init: reduce ifdef forest (specially for Rob's happiness)

Browse Source
This commit is contained in:
Denis Vlasenko 2009-01-28 23:56:31 +00:00
parent a7542dd619
commit b2b2c404b5
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
init/init.c
View File

@ -64,13 +64,7 @@ static const char *log_console = VC_5;
enum { enum {
L_LOG = 0x1, L_LOG = 0x1,
L_CONSOLE = 0x2, L_CONSOLE = 0x2,
MAYBE_CONSOLE = L_CONSOLE * !ENABLE_FEATURE_EXTRA_QUIET,
#if ENABLE_FEATURE_EXTRA_QUIET
MAYBE_CONSOLE = 0x0,
#else
MAYBE_CONSOLE = L_CONSOLE,
#endif
#ifndef RB_HALT_SYSTEM #ifndef RB_HALT_SYSTEM
RB_HALT_SYSTEM = 0xcdef0123, /* FIXME: this overflows enum */ RB_HALT_SYSTEM = 0xcdef0123, /* FIXME: this overflows enum */
RB_ENABLE_CAD = 0x89abcdef, RB_ENABLE_CAD = 0x89abcdef,
@ -775,6 +769,8 @@ static void reload_signal(int sig UNUSED_PARAM)
} }
run_actions(RESPAWN | ASKFIRST); run_actions(RESPAWN | ASKFIRST);
} }
#else
void reload_signal(int sig);
#endif #endif
int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@ -901,11 +897,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
run_actions(ONCE); run_actions(ONCE);
/* Redefine SIGHUP to reread /etc/inittab */ /* Redefine SIGHUP to reread /etc/inittab */
#if ENABLE_FEATURE_USE_INITTAB signal(SIGHUP, ENABLE_FEATURE_USE_INITTAB ? reload_signal : SIG_IGN);
signal(SIGHUP, reload_signal);
#else
signal(SIGHUP, SIG_IGN);
#endif
/* Now run the looping stuff for the rest of forever */ /* Now run the looping stuff for the rest of forever */
while (1) { while (1) {