*: rename ATTRIBUTE_XXX to just XXX.
This commit is contained in:
@ -13,7 +13,7 @@
|
||||
#include "libbb.h"
|
||||
|
||||
int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int dmesg_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int dmesg_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int len;
|
||||
char *buf;
|
||||
|
@ -41,7 +41,7 @@ struct format_descr {
|
||||
#define FD_FILL_BYTE 0xF6 /* format fill byte. */
|
||||
|
||||
int fdformat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int fdformat_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int fdformat_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int fd, n, cyl, read_bytes, verify;
|
||||
unsigned char *data;
|
||||
|
@ -81,12 +81,12 @@ struct partition {
|
||||
unsigned char end_cyl; /* end cylinder */
|
||||
unsigned char start4[4]; /* starting sector counting from 0 */
|
||||
unsigned char size4[4]; /* nr of sectors in partition */
|
||||
} ATTRIBUTE_PACKED;
|
||||
} PACKED;
|
||||
|
||||
static const char unable_to_open[] ALIGN1 = "cannot open %s";
|
||||
static const char unable_to_read[] ALIGN1 = "cannot read from %s";
|
||||
static const char unable_to_seek[] ALIGN1 = "cannot seek on %s";
|
||||
static void fdisk_fatal(const char *why) ATTRIBUTE_NORETURN;
|
||||
static void fdisk_fatal(const char *why) NORETURN;
|
||||
|
||||
enum label_type {
|
||||
LABEL_DOS, LABEL_SUN, LABEL_SGI, LABEL_AIX, LABEL_OSF
|
||||
|
@ -289,7 +289,7 @@ static void recursive_check(unsigned ino);
|
||||
static void recursive_check2(unsigned ino);
|
||||
#endif
|
||||
|
||||
static void die(const char *str) ATTRIBUTE_NORETURN;
|
||||
static void die(const char *str) NORETURN;
|
||||
static void die(const char *str)
|
||||
{
|
||||
if (termios_set)
|
||||
@ -1204,7 +1204,7 @@ void check2(void);
|
||||
#endif
|
||||
|
||||
int fsck_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int fsck_minix_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
struct termios tmp;
|
||||
int retcode = 0;
|
||||
|
@ -90,7 +90,7 @@ static void from_sys_clock(int utc)
|
||||
#define HWCLOCK_OPT_RTCFILE 0x20
|
||||
|
||||
int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int hwclock_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int hwclock_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
unsigned opt;
|
||||
int utc;
|
||||
|
@ -559,7 +559,7 @@ static void print_sem(int semid)
|
||||
}
|
||||
|
||||
int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int ipcs_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int ipcs_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int id = 0;
|
||||
unsigned flags = 0;
|
||||
|
@ -300,9 +300,9 @@ static void make_device(char *path, int delete)
|
||||
|
||||
/* File callback for /sys/ traversal */
|
||||
static int FAST_FUNC fileAction(const char *fileName,
|
||||
struct stat *statbuf ATTRIBUTE_UNUSED,
|
||||
struct stat *statbuf UNUSED_PARAM,
|
||||
void *userData,
|
||||
int depth ATTRIBUTE_UNUSED)
|
||||
int depth UNUSED_PARAM)
|
||||
{
|
||||
size_t len = strlen(fileName) - 4; /* can't underflow */
|
||||
char *scratch = userData;
|
||||
@ -319,9 +319,9 @@ static int FAST_FUNC fileAction(const char *fileName,
|
||||
}
|
||||
|
||||
/* Directory callback for /sys/ traversal */
|
||||
static int FAST_FUNC dirAction(const char *fileName ATTRIBUTE_UNUSED,
|
||||
struct stat *statbuf ATTRIBUTE_UNUSED,
|
||||
void *userData ATTRIBUTE_UNUSED,
|
||||
static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM,
|
||||
struct stat *statbuf UNUSED_PARAM,
|
||||
void *userData UNUSED_PARAM,
|
||||
int depth)
|
||||
{
|
||||
return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
|
||||
|
@ -495,7 +495,7 @@ static size_t do_check(char *buffer, size_t try, unsigned current_block)
|
||||
return try;
|
||||
}
|
||||
|
||||
static void alarm_intr(int alnum ATTRIBUTE_UNUSED)
|
||||
static void alarm_intr(int alnum UNUSED_PARAM)
|
||||
{
|
||||
if (G.currently_testing >= SB_ZONES)
|
||||
return;
|
||||
@ -621,7 +621,7 @@ static void setup_tables(void)
|
||||
}
|
||||
|
||||
int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int mkfs_minix_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
struct mntent *mp;
|
||||
unsigned opt;
|
||||
|
@ -36,7 +36,7 @@ struct globals {
|
||||
#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp)
|
||||
#define getTermSettings(fd, argp) tcgetattr(fd, argp)
|
||||
|
||||
static void gotsig(int sig ATTRIBUTE_UNUSED)
|
||||
static void gotsig(int sig UNUSED_PARAM)
|
||||
{
|
||||
bb_putchar('\n');
|
||||
setTermSettings(cin_fileno, &initial_settings);
|
||||
@ -51,7 +51,7 @@ static void gotsig(int sig ATTRIBUTE_UNUSED)
|
||||
#define CONVERTED_TAB_SIZE 8
|
||||
|
||||
int more_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int more_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int more_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int c = c; /* for gcc */
|
||||
int lines;
|
||||
|
@ -47,7 +47,7 @@
|
||||
/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
|
||||
* dietlibc-0.30 does not have implementation of getmntent_r() */
|
||||
static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
|
||||
char* buffer ATTRIBUTE_UNUSED, int bufsize ATTRIBUTE_UNUSED)
|
||||
char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
|
||||
{
|
||||
struct mntent* ment = getmntent(stream);
|
||||
return memcpy(result, ment, sizeof(*ment));
|
||||
@ -914,7 +914,7 @@ static inline int daemonize(void) { return -ENOSYS; }
|
||||
#endif
|
||||
|
||||
// TODO
|
||||
static inline int we_saw_this_host_before(const char *hostname ATTRIBUTE_UNUSED)
|
||||
static inline int we_saw_this_host_before(const char *hostname UNUSED_PARAM)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@ -1733,7 +1733,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
|
||||
static const char must_be_root[] ALIGN1 = "you must be root";
|
||||
|
||||
int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int mount_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int mount_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
char *cmdopts = xstrdup("");
|
||||
char *fstype = NULL;
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
enum { RFC_868_BIAS = 2208988800UL };
|
||||
|
||||
static void socket_timeout(int sig ATTRIBUTE_UNUSED)
|
||||
static void socket_timeout(int sig UNUSED_PARAM)
|
||||
{
|
||||
bb_error_msg_and_die("timeout connecting to time server");
|
||||
}
|
||||
@ -43,7 +43,7 @@ static time_t askremotedate(const char *host)
|
||||
}
|
||||
|
||||
int rdate_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int rdate_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int rdate_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
time_t remote_time;
|
||||
unsigned long flags;
|
||||
|
@ -42,7 +42,7 @@ static const char defaultmap[] ALIGN1 = "/boot/System.map";
|
||||
static const char defaultpro[] ALIGN1 = "/proc/profile";
|
||||
|
||||
int readprofile_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int readprofile_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int readprofile_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
FILE *map;
|
||||
const char *mapFile, *proFile;
|
||||
|
@ -98,7 +98,7 @@ static void setup_alarm(int fd, time_t *wakeup)
|
||||
#define RTCWAKE_OPT_TIME 0x40
|
||||
|
||||
int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int rtcwake_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int rtcwake_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
unsigned opt;
|
||||
const char *rtcname = NULL;
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
static smallint fd_count = 2;
|
||||
|
||||
static void handle_sigchld(int sig ATTRIBUTE_UNUSED)
|
||||
static void handle_sigchld(int sig UNUSED_PARAM)
|
||||
{
|
||||
fd_count = 0;
|
||||
}
|
||||
|
||||
int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int script_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int script_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int opt;
|
||||
int mode;
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "libbb.h"
|
||||
|
||||
int setarch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int setarch_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int setarch_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int pers = -1;
|
||||
|
||||
|
@ -69,7 +69,7 @@ static int do_em_all(void)
|
||||
}
|
||||
|
||||
int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int swap_on_off_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -65,7 +65,7 @@ static void delete_contents(const char *directory)
|
||||
}
|
||||
|
||||
int switch_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int switch_root_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int switch_root_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
char *newroot, *console = NULL;
|
||||
struct stat st1, st2;
|
||||
|
@ -15,7 +15,7 @@
|
||||
/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
|
||||
* dietlibc-0.30 does not have implementation of getmntent_r() */
|
||||
static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
|
||||
char* buffer ATTRIBUTE_UNUSED, int bufsize ATTRIBUTE_UNUSED)
|
||||
char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
|
||||
{
|
||||
struct mntent* ment = getmntent(stream);
|
||||
return memcpy(result, ment, sizeof(*ment));
|
||||
@ -37,7 +37,7 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
|
||||
//#define MNT_DETACH 0x00000002 /* Just detach from the tree */
|
||||
|
||||
int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int umount_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||
int umount_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int doForce;
|
||||
char *const path = xmalloc(PATH_MAX + 2); /* to save stack */
|
||||
|
Reference in New Issue
Block a user