diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-28 23:56:31 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-28 23:56:31 +0000 |
| commit | b2b2c404b5f2d67adfddc16e8f224e6ab5a7d18f (patch) | |
| tree | 43fb3e2c82103a6af3ec6265cb91eba53e2c0443 | |
| parent | a7542dd619b14fcb883f39dd59a6746459c4e6c4 (diff) | |
| download | busybox-b2b2c404b5f2d67adfddc16e8f224e6ab5a7d18f.tar.gz | |
init: reduce ifdef forest (specially for Rob's happiness)
| -rw-r--r-- | init/init.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/init/init.c b/init/init.c index 10f5ba68d..6ff9953b8 100644 --- a/init/init.c +++ b/init/init.c @@ -64,13 +64,7 @@ static const char *log_console = VC_5; enum { L_LOG = 0x1, L_CONSOLE = 0x2, - -#if ENABLE_FEATURE_EXTRA_QUIET - MAYBE_CONSOLE = 0x0, -#else - MAYBE_CONSOLE = L_CONSOLE, -#endif - + MAYBE_CONSOLE = L_CONSOLE * !ENABLE_FEATURE_EXTRA_QUIET, #ifndef RB_HALT_SYSTEM RB_HALT_SYSTEM = 0xcdef0123, /* FIXME: this overflows enum */ RB_ENABLE_CAD = 0x89abcdef, @@ -775,6 +769,8 @@ static void reload_signal(int sig UNUSED_PARAM) } run_actions(RESPAWN | ASKFIRST); } +#else +void reload_signal(int sig); #endif 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); /* Redefine SIGHUP to reread /etc/inittab */ -#if ENABLE_FEATURE_USE_INITTAB - signal(SIGHUP, reload_signal); -#else - signal(SIGHUP, SIG_IGN); -#endif + signal(SIGHUP, ENABLE_FEATURE_USE_INITTAB ? reload_signal : SIG_IGN); /* Now run the looping stuff for the rest of forever */ while (1) { |