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

lineedit: add missing #if/#endif

Browse Source 
init: fix warnings
This commit is contained in:
Denis Vlasenko 2007-02-03 02:42:47 +00:00
parent 4921b54f37
commit e968fcd562
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
init/init.c
View File

@ -727,20 +727,19 @@ static void exec_signal(int sig ATTRIBUTE_UNUSED)
static void shutdown_signal(int sig) static void shutdown_signal(int sig)
{ {
char *m; const char *m;
int rb; int rb;
shutdown_system(); shutdown_system();
m = "halt";
rb = RB_HALT_SYSTEM;
if (sig == SIGTERM) { if (sig == SIGTERM) {
m = "reboot"; m = "reboot";
rb = RB_AUTOBOOT; rb = RB_AUTOBOOT;
} else if (sig == SIGUSR2) { } else if (sig == SIGUSR2) {
m = "poweroff"; m = "poweroff";
rb = RB_POWER_OFF; rb = RB_POWER_OFF;
} else {
m = "halt";
rb = RB_HALT_SYSTEM;
} }
message(CONSOLE | LOG, "Requesting system %s.", m); message(CONSOLE | LOG, "Requesting system %s.", m);
sync(); sync();
@ -775,7 +774,7 @@ static void cont_handler(int sig ATTRIBUTE_UNUSED)
got_cont = 1; got_cont = 1;
} }
#endif /* ! ENABLE_DEBUG_INIT */ #endif /* !ENABLE_DEBUG_INIT */
static void new_init_action(int action, const char *command, const char *cons) static void new_init_action(int action, const char *command, const char *cons)
{ {

2
libbb/lineedit.c
View File

@ -1269,8 +1269,10 @@ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t
/* With null flags, no other fields are ever used */ /* With null flags, no other fields are ever used */
state = st ? st : (line_input_t*) &const_int_0; state = st ? st : (line_input_t*) &const_int_0;
#if ENABLE_FEATURE_EDITING_SAVEHISTORY
if (state->flags & SAVE_HISTORY) if (state->flags & SAVE_HISTORY)
load_history(state->hist_file); load_history(state->hist_file);
#endif
/* prepare before init handlers */ /* prepare before init handlers */
cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */ cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */