From 2afd5ab62ca5f2438a3953f37e738f73553595da Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 5 Aug 2008 23:32:27 +0000 Subject: *: use get_console_fd() as appropriate, and make it fail on open error - get_console_fd_or_die(). function old new delta get_console_fd_or_die - 163 +163 loadkmap_main 211 201 -10 loadfont_main 440 430 -10 dumpkmap_main 218 208 -10 kbd_mode_main 158 146 -12 setkeycodes_main 156 143 -13 get_console_fd 163 - -163 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/5 up/down: 163/-218) Total: -55 bytes --- libbb/get_console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libbb') diff --git a/libbb/get_console.c b/libbb/get_console.c index d042afa2b..ad56e740f 100644 --- a/libbb/get_console.c +++ b/libbb/get_console.c @@ -38,7 +38,7 @@ static int open_a_console(const char *fnam) * if someone else used X (which does a chown on /dev/console). */ -int FAST_FUNC get_console_fd(void) +int FAST_FUNC get_console_fd_or_die(void) { static const char *const console_names[] = { DEV_CONSOLE, CURRENT_VC, CURRENT_TTY @@ -65,8 +65,8 @@ int FAST_FUNC get_console_fd(void) } } - bb_error_msg("can't open console"); - return fd; /* total failure */ + bb_error_msg_and_die("can't open console"); + /*return fd; - total failure */ } /* From */ -- cgit v1.2.3-55-g6feb