diff options
| author | Denis Vlasenko | 2008-08-05 23:32:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-08-05 23:32:27 +0000 |
| commit | 2afd5ab62ca5f2438a3953f37e738f73553595da (patch) | |
| tree | f6406254bd52e449ac58851e370774ed29e449c2 /console-tools/setkeycodes.c | |
| parent | e0143a1aad60e9141245034379469477006dba81 (diff) | |
| download | busybox-2afd5ab62ca5f2438a3953f37e738f73553595da.zip busybox-2afd5ab62ca5f2438a3953f37e738f73553595da.tar.gz | |
*: 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 'console-tools/setkeycodes.c')
| -rw-r--r-- | console-tools/setkeycodes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index e9a0508..597272a 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c @@ -26,11 +26,11 @@ int setkeycodes_main(int argc, char **argv) int fd, sc; struct kbkeycode a; - if (argc % 2 != 1 || argc < 2) { + if (!(argc & 1) /* if even */ || argc < 2) { bb_show_usage(); } - fd = get_console_fd(); + fd = get_console_fd_or_die(); while (argc > 2) { a.keycode = xatou_range(argv[2], 0, 127); @@ -40,7 +40,7 @@ int setkeycodes_main(int argc, char **argv) a.scancode += 128; } ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a, - "failed to set SCANCODE %x to KEYCODE %d", + "can't set SCANCODE %x to KEYCODE %d", sc, a.keycode); argc -= 2; argv += 2; |