diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-05 13:18:54 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-05 13:18:54 +0400 |
commit | a60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch) | |
tree | f59bc665cfe3d2d32622450d80523e3c1265e501 /networking/libiproute | |
parent | f6efccc0659a2e2978f2021153f34ce92257ad2b (diff) |
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/ip_common.h | 2 | ||||
-rw-r--r-- | networking/libiproute/ipaddress.c | 4 | ||||
-rw-r--r-- | networking/libiproute/iplink.c | 2 | ||||
-rw-r--r-- | networking/libiproute/iproute.c | 4 | ||||
-rw-r--r-- | networking/libiproute/iprule.c | 4 | ||||
-rw-r--r-- | networking/libiproute/ll_map.c | 4 | ||||
-rw-r--r-- | networking/libiproute/utils.c | 2 | ||||
-rw-r--r-- | networking/libiproute/utils.h | 8 |
8 files changed, 15 insertions, 15 deletions
diff --git a/networking/libiproute/ip_common.h b/networking/libiproute/ip_common.h index 346d0b96c..305b491c6 100644 --- a/networking/libiproute/ip_common.h +++ b/networking/libiproute/ip_common.h @@ -21,7 +21,7 @@ extern char **ip_parse_common_args(char **argv); extern int print_neigh(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); extern int ipaddr_list_or_flush(char **argv, int flush); extern int iproute_monitor(char **argv); -extern void iplink_usage(void) ATTRIBUTE_NORETURN; +extern void iplink_usage(void) NORETURN; extern void ipneigh_reset_filter(void); extern int do_ipaddr(char **argv); diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 7a948a19d..288dccae7 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -196,8 +196,8 @@ static int flush_update(void) return 0; } -static int print_addrinfo(const struct sockaddr_nl *who ATTRIBUTE_UNUSED, - struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED) +static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, + struct nlmsghdr *n, void *arg UNUSED_PARAM) { struct ifaddrmsg *ifa = NLMSG_DATA(n); int len = n->nlmsg_len; diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 5aad6ed9f..3b212eed9 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -154,7 +154,7 @@ static void set_address(struct ifreq *ifr, int brd) } -static void die_must_be_on_off(const char *msg) ATTRIBUTE_NORETURN; +static void die_must_be_on_off(const char *msg) NORETURN; static void die_must_be_on_off(const char *msg) { bb_error_msg_and_die("argument of \"%s\" must be \"on\" or \"off\"", msg); diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 07a88c4dd..17af41f9c 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -78,8 +78,8 @@ static unsigned get_hz(void) return hz_internal; } -static int print_route(const struct sockaddr_nl *who ATTRIBUTE_UNUSED, - struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED) +static int print_route(const struct sockaddr_nl *who UNUSED_PARAM, + struct nlmsghdr *n, void *arg UNUSED_PARAM) { struct rtmsg *r = NLMSG_DATA(n); int len = n->nlmsg_len; diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index 2ee7701f8..f92607830 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c @@ -40,8 +40,8 @@ static void usage(void) } */ -static int print_rule(const struct sockaddr_nl *who ATTRIBUTE_UNUSED, - struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED) +static int print_rule(const struct sockaddr_nl *who UNUSED_PARAM, + struct nlmsghdr *n, void *arg UNUSED_PARAM) { struct rtmsg *r = NLMSG_DATA(n); int len = n->nlmsg_len; diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index f9b697070..eeae4e252 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -39,9 +39,9 @@ static struct idxmap *find_by_index(int idx) return NULL; } -int ll_remember_index(const struct sockaddr_nl *who ATTRIBUTE_UNUSED, +int ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM, struct nlmsghdr *n, - void *arg ATTRIBUTE_UNUSED) + void *arg UNUSED_PARAM) { int h; struct ifinfomsg *ifi = NLMSG_DATA(n); diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c index e63bb27fb..706710e1f 100644 --- a/networking/libiproute/utils.c +++ b/networking/libiproute/utils.c @@ -279,7 +279,7 @@ int inet_addr_match(inet_prefix * a, inet_prefix * b, int bits) return 0; } -const char *rt_addr_n2a(int af, int ATTRIBUTE_UNUSED len, +const char *rt_addr_n2a(int af, int UNUSED_PARAM len, void *addr, char *buf, int buflen) { switch (af) { diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h index 06b1f04ab..607083af8 100644 --- a/networking/libiproute/utils.h +++ b/networking/libiproute/utils.h @@ -28,7 +28,7 @@ extern char _SL_; #define SPRINT_BSIZE 64 #define SPRINT_BUF(x) char x[SPRINT_BSIZE] -extern void incomplete_command(void) ATTRIBUTE_NORETURN; +extern void incomplete_command(void) NORETURN; #define NEXT_ARG() do { if (!*++argv) incomplete_command(); } while (0) @@ -76,9 +76,9 @@ extern int get_s8(int8_t *val, char *arg, int base); extern const char *format_host(int af, int len, void *addr, char *buf, int buflen); extern const char *rt_addr_n2a(int af, int len, void *addr, char *buf, int buflen); -void invarg(const char *, const char *) ATTRIBUTE_NORETURN; -void duparg(const char *, const char *) ATTRIBUTE_NORETURN; -void duparg2(const char *, const char *) ATTRIBUTE_NORETURN; +void invarg(const char *, const char *) NORETURN; +void duparg(const char *, const char *) NORETURN; +void duparg2(const char *, const char *) NORETURN; int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits); const char *dnet_ntop(int af, const void *addr, char *str, size_t len); |