diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:04:04 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:04:04 +0000 |
commit | 85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50 (patch) | |
tree | 0b60f25ea0ebfbac5d9b3fa22f123aadaecd6663 /util-linux | |
parent | 081eb71ebd7954a67287816a9a6fff80e8c5319a (diff) | |
download | busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.gz busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.bz2 busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.zip |
*: fix fallout from -Wunused-parameter
function old new delta
bbunpack 358 366 +8
passwd_main 1070 1072 +2
handle_incoming_and_exit 2651 2653 +2
getpty 88 86 -2
script_main 975 972 -3
inetd_main 2036 2033 -3
dname_enc 377 373 -4
make_new_session 474 462 -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/5 up/down: 12/-24) Total: -12 bytes
text data bss dec hex filename
797429 658 7428 805515 c4a8b busybox_old
797417 658 7428 805503 c4a7f busybox_unstripped
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fbset.c | 10 | ||||
-rw-r--r-- | util-linux/fdisk.c | 12 | ||||
-rw-r--r-- | util-linux/script.c | 4 | ||||
-rw-r--r-- | util-linux/volume_id/get_devname.c | 8 |
4 files changed, 26 insertions, 8 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index d616abd36..ab7770d4f 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -170,10 +170,10 @@ enum { | |||
170 | }; | 170 | }; |
171 | #endif | 171 | #endif |
172 | 172 | ||
173 | #if ENABLE_FEATURE_FBSET_READMODE | ||
173 | static int readmode(struct fb_var_screeninfo *base, const char *fn, | 174 | static int readmode(struct fb_var_screeninfo *base, const char *fn, |
174 | const char *mode) | 175 | const char *mode) |
175 | { | 176 | { |
176 | #if ENABLE_FEATURE_FBSET_READMODE | ||
177 | FILE *f; | 177 | FILE *f; |
178 | char buf[256]; | 178 | char buf[256]; |
179 | char *p = buf; | 179 | char *p = buf; |
@@ -257,11 +257,9 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn, | |||
257 | return 1; | 257 | return 1; |
258 | } | 258 | } |
259 | } | 259 | } |
260 | #else | ||
261 | bb_error_msg("mode reading not compiled in"); | ||
262 | #endif | ||
263 | return 0; | 260 | return 0; |
264 | } | 261 | } |
262 | #endif | ||
265 | 263 | ||
266 | static inline void setmode(struct fb_var_screeninfo *base, | 264 | static inline void setmode(struct fb_var_screeninfo *base, |
267 | struct fb_var_screeninfo *set) | 265 | struct fb_var_screeninfo *set) |
@@ -389,9 +387,13 @@ int fbset_main(int argc, char **argv) | |||
389 | fh = xopen(fbdev, O_RDONLY); | 387 | fh = xopen(fbdev, O_RDONLY); |
390 | xioctl(fh, FBIOGET_VSCREENINFO, &var); | 388 | xioctl(fh, FBIOGET_VSCREENINFO, &var); |
391 | if (g_options & OPT_READMODE) { | 389 | if (g_options & OPT_READMODE) { |
390 | #if !ENABLE_FEATURE_FBSET_READMODE | ||
391 | bb_show_usage(); | ||
392 | #else | ||
392 | if (!readmode(&var, modefile, mode)) { | 393 | if (!readmode(&var, modefile, mode)) { |
393 | bb_error_msg_and_die("unknown video mode '%s'", mode); | 394 | bb_error_msg_and_die("unknown video mode '%s'", mode); |
394 | } | 395 | } |
396 | #endif | ||
395 | } | 397 | } |
396 | 398 | ||
397 | setmode(&var, &varset); | 399 | setmode(&var, &varset); |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index a75b4f817..dcfae96f5 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -128,7 +128,11 @@ static unsigned read_int(unsigned low, unsigned dflt, unsigned high, unsigned ba | |||
128 | #endif | 128 | #endif |
129 | static const char *partition_type(unsigned char type); | 129 | static const char *partition_type(unsigned char type); |
130 | static void get_geometry(void); | 130 | static void get_geometry(void); |
131 | #if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE | ||
131 | static int get_boot(enum action what); | 132 | static int get_boot(enum action what); |
133 | #else | ||
134 | static int get_boot(void); | ||
135 | #endif | ||
132 | 136 | ||
133 | #define PLURAL 0 | 137 | #define PLURAL 0 |
134 | #define SINGULAR 1 | 138 | #define SINGULAR 1 |
@@ -1237,8 +1241,12 @@ get_geometry(void) | |||
1237 | * 0: found or created label | 1241 | * 0: found or created label |
1238 | * 1: I/O error | 1242 | * 1: I/O error |
1239 | */ | 1243 | */ |
1240 | static int | 1244 | #if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE |
1241 | get_boot(enum action what) | 1245 | static int get_boot(enum action what) |
1246 | #else | ||
1247 | static int get_boot(void) | ||
1248 | #define get_boot(what) get_boot() | ||
1249 | #endif | ||
1242 | { | 1250 | { |
1243 | int i; | 1251 | int i; |
1244 | 1252 | ||
diff --git a/util-linux/script.c b/util-linux/script.c index c37fd9d61..1c95ea550 100644 --- a/util-linux/script.c +++ b/util-linux/script.c | |||
@@ -29,7 +29,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
29 | int attr_ok; /* NB: 0: ok */ | 29 | int attr_ok; /* NB: 0: ok */ |
30 | int winsz_ok; | 30 | int winsz_ok; |
31 | int pty; | 31 | int pty; |
32 | char pty_line[32]; | 32 | char pty_line[GETPTY_BUFSIZE]; |
33 | struct termios tt, rtt; | 33 | struct termios tt, rtt; |
34 | struct winsize win; | 34 | struct winsize win; |
35 | const char *fname = "typescript"; | 35 | const char *fname = "typescript"; |
@@ -69,7 +69,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
69 | shell = DEFAULT_SHELL; | 69 | shell = DEFAULT_SHELL; |
70 | } | 70 | } |
71 | 71 | ||
72 | pty = getpty(pty_line, sizeof(pty_line)); | 72 | pty = getpty(pty_line); |
73 | if (pty < 0) { | 73 | if (pty < 0) { |
74 | bb_perror_msg_and_die("can't get pty"); | 74 | bb_perror_msg_and_die("can't get pty"); |
75 | } | 75 | } |
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c index 75060b0d8..af03d07a3 100644 --- a/util-linux/volume_id/get_devname.c +++ b/util-linux/volume_id/get_devname.c | |||
@@ -26,6 +26,10 @@ static struct uuidCache_s { | |||
26 | } *uuidCache; | 26 | } *uuidCache; |
27 | 27 | ||
28 | /* for now, only ext2, ext3 and xfs are supported */ | 28 | /* for now, only ext2, ext3 and xfs are supported */ |
29 | #if !ENABLE_FEATURE_VOLUMEID_ISO9660 | ||
30 | #define get_label_uuid(device, label, uuid, iso_only) \ | ||
31 | get_label_uuid(device, label, uuid) | ||
32 | #endif | ||
29 | static int | 33 | static int |
30 | get_label_uuid(const char *device, char **label, char **uuid, int iso_only) | 34 | get_label_uuid(const char *device, char **label, char **uuid, int iso_only) |
31 | { | 35 | { |
@@ -83,6 +87,10 @@ uuidcache_addentry(char * device, int major, int minor, char *label, char *uuid) | |||
83 | memcpy(last->uuid, uuid, sizeof(last->uuid)); | 87 | memcpy(last->uuid, uuid, sizeof(last->uuid)); |
84 | } | 88 | } |
85 | 89 | ||
90 | #if !ENABLE_FEATURE_VOLUMEID_ISO9660 | ||
91 | #define uuidcache_check_device(device_name, ma, mi, iso_only) \ | ||
92 | uuidcache_check_device(device_name, ma, mi) | ||
93 | #endif | ||
86 | static void | 94 | static void |
87 | uuidcache_check_device(const char *device_name, int ma, int mi, int iso_only) | 95 | uuidcache_check_device(const char *device_name, int ma, int mi, int iso_only) |
88 | { | 96 | { |