aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/dmesg.c2
-rw-r--r--util-linux/fdformat.c2
-rw-r--r--util-linux/fdisk.c4
-rw-r--r--util-linux/fsck_minix.c4
-rw-r--r--util-linux/hwclock.c2
-rw-r--r--util-linux/ipcs.c2
-rw-r--r--util-linux/mdev.c10
-rw-r--r--util-linux/mkfs_minix.c4
-rw-r--r--util-linux/more.c4
-rw-r--r--util-linux/mount.c6
-rw-r--r--util-linux/rdate.c4
-rw-r--r--util-linux/readprofile.c2
-rw-r--r--util-linux/rtcwake.c2
-rw-r--r--util-linux/script.c4
-rw-r--r--util-linux/setarch.c2
-rw-r--r--util-linux/swaponoff.c2
-rw-r--r--util-linux/switch_root.c2
-rw-r--r--util-linux/umount.c4
18 files changed, 31 insertions, 31 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 73b2595f1..840358c85 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -13,7 +13,7 @@
13#include "libbb.h" 13#include "libbb.h"
14 14
15int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 15int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
16int dmesg_main(int argc ATTRIBUTE_UNUSED, char **argv) 16int dmesg_main(int argc UNUSED_PARAM, char **argv)
17{ 17{
18 int len; 18 int len;
19 char *buf; 19 char *buf;
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index eac7b15e9..094d620ee 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -41,7 +41,7 @@ struct format_descr {
41#define FD_FILL_BYTE 0xF6 /* format fill byte. */ 41#define FD_FILL_BYTE 0xF6 /* format fill byte. */
42 42
43int fdformat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 43int fdformat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
44int fdformat_main(int argc ATTRIBUTE_UNUSED, char **argv) 44int fdformat_main(int argc UNUSED_PARAM, char **argv)
45{ 45{
46 int fd, n, cyl, read_bytes, verify; 46 int fd, n, cyl, read_bytes, verify;
47 unsigned char *data; 47 unsigned char *data;
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index a1d31501b..b44a2b425 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -81,12 +81,12 @@ struct partition {
81 unsigned char end_cyl; /* end cylinder */ 81 unsigned char end_cyl; /* end cylinder */
82 unsigned char start4[4]; /* starting sector counting from 0 */ 82 unsigned char start4[4]; /* starting sector counting from 0 */
83 unsigned char size4[4]; /* nr of sectors in partition */ 83 unsigned char size4[4]; /* nr of sectors in partition */
84} ATTRIBUTE_PACKED; 84} PACKED;
85 85
86static const char unable_to_open[] ALIGN1 = "cannot open %s"; 86static const char unable_to_open[] ALIGN1 = "cannot open %s";
87static const char unable_to_read[] ALIGN1 = "cannot read from %s"; 87static const char unable_to_read[] ALIGN1 = "cannot read from %s";
88static const char unable_to_seek[] ALIGN1 = "cannot seek on %s"; 88static const char unable_to_seek[] ALIGN1 = "cannot seek on %s";
89static void fdisk_fatal(const char *why) ATTRIBUTE_NORETURN; 89static void fdisk_fatal(const char *why) NORETURN;
90 90
91enum label_type { 91enum label_type {
92 LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF 92 LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index cd17afafe..b0d5c6a3f 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -289,7 +289,7 @@ static void recursive_check(unsigned ino);
289static void recursive_check2(unsigned ino); 289static void recursive_check2(unsigned ino);
290#endif 290#endif
291 291
292static void die(const char *str) ATTRIBUTE_NORETURN; 292static void die(const char *str) NORETURN;
293static void die(const char *str) 293static void die(const char *str)
294{ 294{
295 if (termios_set) 295 if (termios_set)
@@ -1204,7 +1204,7 @@ void check2(void);
1204#endif 1204#endif
1205 1205
1206int fsck_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 1206int fsck_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
1207int fsck_minix_main(int argc ATTRIBUTE_UNUSED, char **argv) 1207int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
1208{ 1208{
1209 struct termios tmp; 1209 struct termios tmp;
1210 int retcode = 0; 1210 int retcode = 0;
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index a03d61bbf..3d28364e9 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -90,7 +90,7 @@ static void from_sys_clock(int utc)
90#define HWCLOCK_OPT_RTCFILE 0x20 90#define HWCLOCK_OPT_RTCFILE 0x20
91 91
92int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 92int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
93int hwclock_main(int argc ATTRIBUTE_UNUSED, char **argv) 93int hwclock_main(int argc UNUSED_PARAM, char **argv)
94{ 94{
95 unsigned opt; 95 unsigned opt;
96 int utc; 96 int utc;
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 111defa1e..920125708 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -559,7 +559,7 @@ static void print_sem(int semid)
559} 559}
560 560
561int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 561int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
562int ipcs_main(int argc ATTRIBUTE_UNUSED, char **argv) 562int ipcs_main(int argc UNUSED_PARAM, char **argv)
563{ 563{
564 int id = 0; 564 int id = 0;
565 unsigned flags = 0; 565 unsigned flags = 0;
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index bacccc02f..c7109373d 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -300,9 +300,9 @@ static void make_device(char *path, int delete)
300 300
301/* File callback for /sys/ traversal */ 301/* File callback for /sys/ traversal */
302static int FAST_FUNC fileAction(const char *fileName, 302static int FAST_FUNC fileAction(const char *fileName,
303 struct stat *statbuf ATTRIBUTE_UNUSED, 303 struct stat *statbuf UNUSED_PARAM,
304 void *userData, 304 void *userData,
305 int depth ATTRIBUTE_UNUSED) 305 int depth UNUSED_PARAM)
306{ 306{
307 size_t len = strlen(fileName) - 4; /* can't underflow */ 307 size_t len = strlen(fileName) - 4; /* can't underflow */
308 char *scratch = userData; 308 char *scratch = userData;
@@ -319,9 +319,9 @@ static int FAST_FUNC fileAction(const char *fileName,
319} 319}
320 320
321/* Directory callback for /sys/ traversal */ 321/* Directory callback for /sys/ traversal */
322static int FAST_FUNC dirAction(const char *fileName ATTRIBUTE_UNUSED, 322static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM,
323 struct stat *statbuf ATTRIBUTE_UNUSED, 323 struct stat *statbuf UNUSED_PARAM,
324 void *userData ATTRIBUTE_UNUSED, 324 void *userData UNUSED_PARAM,
325 int depth) 325 int depth)
326{ 326{
327 return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE); 327 return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 1e00a085c..ceeb72a2b 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -495,7 +495,7 @@ static size_t do_check(char *buffer, size_t try, unsigned current_block)
495 return try; 495 return try;
496} 496}
497 497
498static void alarm_intr(int alnum ATTRIBUTE_UNUSED) 498static void alarm_intr(int alnum UNUSED_PARAM)
499{ 499{
500 if (G.currently_testing >= SB_ZONES) 500 if (G.currently_testing >= SB_ZONES)
501 return; 501 return;
@@ -621,7 +621,7 @@ static void setup_tables(void)
621} 621}
622 622
623int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 623int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
624int mkfs_minix_main(int argc ATTRIBUTE_UNUSED, char **argv) 624int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
625{ 625{
626 struct mntent *mp; 626 struct mntent *mp;
627 unsigned opt; 627 unsigned opt;
diff --git a/util-linux/more.c b/util-linux/more.c
index 2577a67ac..93954660e 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -36,7 +36,7 @@ struct globals {
36#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp) 36#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp)
37#define getTermSettings(fd, argp) tcgetattr(fd, argp) 37#define getTermSettings(fd, argp) tcgetattr(fd, argp)
38 38
39static void gotsig(int sig ATTRIBUTE_UNUSED) 39static void gotsig(int sig UNUSED_PARAM)
40{ 40{
41 bb_putchar('\n'); 41 bb_putchar('\n');
42 setTermSettings(cin_fileno, &initial_settings); 42 setTermSettings(cin_fileno, &initial_settings);
@@ -51,7 +51,7 @@ static void gotsig(int sig ATTRIBUTE_UNUSED)
51#define CONVERTED_TAB_SIZE 8 51#define CONVERTED_TAB_SIZE 8
52 52
53int more_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 53int more_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
54int more_main(int argc ATTRIBUTE_UNUSED, char **argv) 54int more_main(int argc UNUSED_PARAM, char **argv)
55{ 55{
56 int c = c; /* for gcc */ 56 int c = c; /* for gcc */
57 int lines; 57 int lines;
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 3b77af728..f73ad608b 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -47,7 +47,7 @@
47/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 47/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
48 * dietlibc-0.30 does not have implementation of getmntent_r() */ 48 * dietlibc-0.30 does not have implementation of getmntent_r() */
49static struct mntent *getmntent_r(FILE* stream, struct mntent* result, 49static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
50 char* buffer ATTRIBUTE_UNUSED, int bufsize ATTRIBUTE_UNUSED) 50 char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
51{ 51{
52 struct mntent* ment = getmntent(stream); 52 struct mntent* ment = getmntent(stream);
53 return memcpy(result, ment, sizeof(*ment)); 53 return memcpy(result, ment, sizeof(*ment));
@@ -914,7 +914,7 @@ static inline int daemonize(void) { return -ENOSYS; }
914#endif 914#endif
915 915
916// TODO 916// TODO
917static inline int we_saw_this_host_before(const char *hostname ATTRIBUTE_UNUSED) 917static inline int we_saw_this_host_before(const char *hostname UNUSED_PARAM)
918{ 918{
919 return 0; 919 return 0;
920} 920}
@@ -1733,7 +1733,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
1733static const char must_be_root[] ALIGN1 = "you must be root"; 1733static const char must_be_root[] ALIGN1 = "you must be root";
1734 1734
1735int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 1735int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
1736int mount_main(int argc ATTRIBUTE_UNUSED, char **argv) 1736int mount_main(int argc UNUSED_PARAM, char **argv)
1737{ 1737{
1738 char *cmdopts = xstrdup(""); 1738 char *cmdopts = xstrdup("");
1739 char *fstype = NULL; 1739 char *fstype = NULL;
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 9e7bdba35..0880edff5 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -12,7 +12,7 @@
12 12
13enum { RFC_868_BIAS = 2208988800UL }; 13enum { RFC_868_BIAS = 2208988800UL };
14 14
15static void socket_timeout(int sig ATTRIBUTE_UNUSED) 15static void socket_timeout(int sig UNUSED_PARAM)
16{ 16{
17 bb_error_msg_and_die("timeout connecting to time server"); 17 bb_error_msg_and_die("timeout connecting to time server");
18} 18}
@@ -43,7 +43,7 @@ static time_t askremotedate(const char *host)
43} 43}
44 44
45int rdate_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 45int rdate_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
46int rdate_main(int argc ATTRIBUTE_UNUSED, char **argv) 46int rdate_main(int argc UNUSED_PARAM, char **argv)
47{ 47{
48 time_t remote_time; 48 time_t remote_time;
49 unsigned long flags; 49 unsigned long flags;
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index cac5fa4a1..1c157120d 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -42,7 +42,7 @@ static const char defaultmap[] ALIGN1 = "/boot/System.map";
42static const char defaultpro[] ALIGN1 = "/proc/profile"; 42static const char defaultpro[] ALIGN1 = "/proc/profile";
43 43
44int readprofile_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 44int readprofile_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
45int readprofile_main(int argc ATTRIBUTE_UNUSED, char **argv) 45int readprofile_main(int argc UNUSED_PARAM, char **argv)
46{ 46{
47 FILE *map; 47 FILE *map;
48 const char *mapFile, *proFile; 48 const char *mapFile, *proFile;
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 2b2634f0b..a9766caaa 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -98,7 +98,7 @@ static void setup_alarm(int fd, time_t *wakeup)
98#define RTCWAKE_OPT_TIME 0x40 98#define RTCWAKE_OPT_TIME 0x40
99 99
100int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 100int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
101int rtcwake_main(int argc ATTRIBUTE_UNUSED, char **argv) 101int rtcwake_main(int argc UNUSED_PARAM, char **argv)
102{ 102{
103 unsigned opt; 103 unsigned opt;
104 const char *rtcname = NULL; 104 const char *rtcname = NULL;
diff --git a/util-linux/script.c b/util-linux/script.c
index e70294e6c..39ec546a7 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -15,13 +15,13 @@
15 15
16static smallint fd_count = 2; 16static smallint fd_count = 2;
17 17
18static void handle_sigchld(int sig ATTRIBUTE_UNUSED) 18static void handle_sigchld(int sig UNUSED_PARAM)
19{ 19{
20 fd_count = 0; 20 fd_count = 0;
21} 21}
22 22
23int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 23int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
24int script_main(int argc ATTRIBUTE_UNUSED, char **argv) 24int script_main(int argc UNUSED_PARAM, char **argv)
25{ 25{
26 int opt; 26 int opt;
27 int mode; 27 int mode;
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index 1f979a73c..250a93823 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -12,7 +12,7 @@
12#include "libbb.h" 12#include "libbb.h"
13 13
14int setarch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 14int setarch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
15int setarch_main(int argc ATTRIBUTE_UNUSED, char **argv) 15int setarch_main(int argc UNUSED_PARAM, char **argv)
16{ 16{
17 int pers = -1; 17 int pers = -1;
18 18
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 6eafa3e21..863f7734a 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -69,7 +69,7 @@ static int do_em_all(void)
69} 69}
70 70
71int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 71int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
72int swap_on_off_main(int argc ATTRIBUTE_UNUSED, char **argv) 72int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
73{ 73{
74 int ret; 74 int ret;
75 75
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index bae695b0b..1f6ec2dc7 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -65,7 +65,7 @@ static void delete_contents(const char *directory)
65} 65}
66 66
67int switch_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 67int switch_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
68int switch_root_main(int argc ATTRIBUTE_UNUSED, char **argv) 68int switch_root_main(int argc UNUSED_PARAM, char **argv)
69{ 69{
70 char *newroot, *console = NULL; 70 char *newroot, *console = NULL;
71 struct stat st1, st2; 71 struct stat st1, st2;
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 9fa3cd2d3..00f125334 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -15,7 +15,7 @@
15/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 15/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
16 * dietlibc-0.30 does not have implementation of getmntent_r() */ 16 * dietlibc-0.30 does not have implementation of getmntent_r() */
17static struct mntent *getmntent_r(FILE* stream, struct mntent* result, 17static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
18 char* buffer ATTRIBUTE_UNUSED, int bufsize ATTRIBUTE_UNUSED) 18 char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
19{ 19{
20 struct mntent* ment = getmntent(stream); 20 struct mntent* ment = getmntent(stream);
21 return memcpy(result, ment, sizeof(*ment)); 21 return memcpy(result, ment, sizeof(*ment));
@@ -37,7 +37,7 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
37//#define MNT_DETACH 0x00000002 /* Just detach from the tree */ 37//#define MNT_DETACH 0x00000002 /* Just detach from the tree */
38 38
39int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 39int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
40int umount_main(int argc ATTRIBUTE_UNUSED, char **argv) 40int umount_main(int argc UNUSED_PARAM, char **argv)
41{ 41{
42 int doForce; 42 int doForce;
43 char *const path = xmalloc(PATH_MAX + 2); /* to save stack */ 43 char *const path = xmalloc(PATH_MAX + 2); /* to save stack */