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

*: use get_console_fd() as appropriate, and make it fail on open error -

Browse Source 
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
This commit is contained in:
Denis Vlasenko
2008-08-05 23:32:27 +00:00
parent e0143a1aad
commit 2afd5ab62c
9 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libbb/get_console.c
View File

@ -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 <linux/vt.h> */