aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-10-29 11:46:52 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-10-29 11:46:52 +0200
commitfb132e47370378474c68ad22c1c0cb2ccee178de (patch)
tree4f78d0fdd1c2fa2341c7d9bb17f9d98d099a238c /console-tools
parent66cb7bed33da605674c3d24734466b8e8a60e337 (diff)
downloadbusybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.gz
busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.bz2
busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.zip
whitespace cleanup
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/kbd_mode.c4
-rw-r--r--console-tools/loadfont.c8
-rw-r--r--console-tools/showkey.c12
3 files changed, 12 insertions, 12 deletions
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index 14f2ae516..1481d0dbb 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -16,9 +16,9 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
16{ 16{
17 enum { 17 enum {
18 SCANCODE = (1 << 0), 18 SCANCODE = (1 << 0),
19 ASCII = (1 << 1), 19 ASCII = (1 << 1),
20 MEDIUMRAW = (1 << 2), 20 MEDIUMRAW = (1 << 2),
21 UNICODE = (1 << 3), 21 UNICODE = (1 << 3),
22 }; 22 };
23 int fd; 23 int fd;
24 unsigned opt; 24 unsigned opt;
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 3c77813b5..079626c20 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -136,7 +136,7 @@ static void do_loadfont(int fd, unsigned char *inbuf, int height, int width, int
136 * Example: 136 * Example:
137 * At the font position for a capital A-ring glyph, we 137 * At the font position for a capital A-ring glyph, we
138 * may have: 138 * may have:
139 * 00C5,212B,FFFE,0041,030A,FFFF 139 * 00C5,212B,FFFE,0041,030A,FFFF
140 * Some font positions may be described by sequences only, 140 * Some font positions may be described by sequences only,
141 * namely when there is no precomposed Unicode value for the glyph. 141 * namely when there is no precomposed Unicode value for the glyph.
142 */ 142 */
@@ -159,7 +159,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize,
159 int glyph; 159 int glyph;
160 uint16_t unicode; 160 uint16_t unicode;
161 161
162 maxct = tailsz; /* more than enough */ 162 maxct = tailsz; /* more than enough */
163 up = xmalloc(maxct * sizeof(*up)); 163 up = xmalloc(maxct * sizeof(*up));
164 164
165 for (glyph = 0; glyph < fontsize; glyph++) { 165 for (glyph = 0; glyph < fontsize; glyph++) {
@@ -255,10 +255,10 @@ static void do_load(int fd, unsigned char *buffer, size_t len)
255 } else 255 } else
256#endif 256#endif
257#if ENABLE_FEATURE_LOADFONT_RAW 257#if ENABLE_FEATURE_LOADFONT_RAW
258 if (len == 9780) { /* file with three code pages? */ 258 if (len == 9780) { /* file with three code pages? */
259 charsize = height = 16; 259 charsize = height = 16;
260 font += 40; 260 font += 40;
261 } else if ((len & 0377) == 0) { /* bare font */ 261 } else if ((len & 0377) == 0) { /* bare font */
262 charsize = height = len / 256; 262 charsize = height = len / 256;
263 } else 263 } else
264#endif 264#endif
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index b29c84d6a..e7834f702 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -16,9 +16,9 @@ struct globals {
16 struct termios tio, tio0; 16 struct termios tio, tio0;
17}; 17};
18#define G (*ptr_to_globals) 18#define G (*ptr_to_globals)
19#define kbmode (G.kbmode) 19#define kbmode (G.kbmode)
20#define tio (G.tio) 20#define tio (G.tio)
21#define tio0 (G.tio0) 21#define tio0 (G.tio0)
22#define INIT_G() do { \ 22#define INIT_G() do { \
23 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ 23 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
24} while (0) 24} while (0)
@@ -46,9 +46,9 @@ int showkey_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
46int showkey_main(int argc UNUSED_PARAM, char **argv) 46int showkey_main(int argc UNUSED_PARAM, char **argv)
47{ 47{
48 enum { 48 enum {
49 OPT_a = (1<<0), // display the decimal/octal/hex values of the keys 49 OPT_a = (1<<0), // display the decimal/octal/hex values of the keys
50 OPT_k = (1<<1), // display only the interpreted keycodes (default) 50 OPT_k = (1<<1), // display only the interpreted keycodes (default)
51 OPT_s = (1<<2), // display only the raw scan-codes 51 OPT_s = (1<<2), // display only the raw scan-codes
52 }; 52 };
53 53
54 INIT_G(); 54 INIT_G();