diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 23:32:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 23:32:27 +0000 |
| commit | 2afd5ab62ca5f2438a3953f37e738f73553595da (patch) | |
| tree | f6406254bd52e449ac58851e370774ed29e449c2 /libbb | |
| parent | e0143a1aad60e9141245034379469477006dba81 (diff) | |
| download | busybox-w32-2afd5ab62ca5f2438a3953f37e738f73553595da.tar.gz busybox-w32-2afd5ab62ca5f2438a3953f37e738f73553595da.tar.bz2 busybox-w32-2afd5ab62ca5f2438a3953f37e738f73553595da.zip | |
*: 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
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/get_console.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 38 | * if someone else used X (which does a chown on /dev/console). | 38 | * if someone else used X (which does a chown on /dev/console). |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | int FAST_FUNC get_console_fd(void) | 41 | int FAST_FUNC get_console_fd_or_die(void) |
| 42 | { | 42 | { |
| 43 | static const char *const console_names[] = { | 43 | static const char *const console_names[] = { |
| 44 | DEV_CONSOLE, CURRENT_VC, CURRENT_TTY | 44 | DEV_CONSOLE, CURRENT_VC, CURRENT_TTY |
| @@ -65,8 +65,8 @@ int FAST_FUNC get_console_fd(void) | |||
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | bb_error_msg("can't open console"); | 68 | bb_error_msg_and_die("can't open console"); |
| 69 | return fd; /* total failure */ | 69 | /*return fd; - total failure */ |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /* From <linux/vt.h> */ | 72 | /* From <linux/vt.h> */ |