diff options
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/ip_parse_common_args.c | 2 | ||||
-rw-r--r-- | networking/libiproute/ipaddress.c | 6 | ||||
-rw-r--r-- | networking/libiproute/iplink.c | 4 | ||||
-rw-r--r-- | networking/libiproute/iproute.c | 10 | ||||
-rw-r--r-- | networking/libiproute/iprule.c | 4 | ||||
-rw-r--r-- | networking/libiproute/iptunnel.c | 4 | ||||
-rw-r--r-- | networking/libiproute/ll_map.c | 2 | ||||
-rw-r--r-- | networking/libiproute/ll_map.h | 2 | ||||
-rw-r--r-- | networking/libiproute/rtm_map.c | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index 0e429a0..ff33399 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c @@ -26,7 +26,7 @@ void ip_parse_common_args(int *argcp, char ***argvp) { int argc = *argcp; char **argv = *argvp; - static const char ip_common_commands[] = + static const char ip_common_commands[] ALIGN1 = "-family\0""inet\0""inet6\0""link\0" "-4\0""-6\0""-0\0""-oneline\0"; enum { diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 8874fdb..6a5f2cf 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -412,7 +412,7 @@ static void ipaddr_reset_filter(int _oneline) /* Return value becomes exitcode. It's okay to not return at all */ int ipaddr_list_or_flush(int argc, char **argv, int flush) { - static const char option[] = "to\0""scope\0""up\0""label\0""dev\0"; + static const char option[] ALIGN1 = "to\0""scope\0""up\0""label\0""dev\0"; struct nlmsg_list *linfo = NULL; struct nlmsg_list *ainfo = NULL; @@ -599,7 +599,7 @@ static int default_scope(inet_prefix *lcl) /* Return value becomes exitcode. It's okay to not return at all */ static int ipaddr_modify(int cmd, int argc, char **argv) { - static const char option[] = + static const char option[] ALIGN1 = "peer\0""remote\0""broadcast\0""brd\0" "anycast\0""scope\0""dev\0""label\0""local\0"; struct rtnl_handle rth; @@ -768,7 +768,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv) /* Return value becomes exitcode. It's okay to not return at all */ int do_ipaddr(int argc, char **argv) { - static const char commands[] = + static const char commands[] ALIGN1 = "add\0""delete\0""list\0""show\0""lst\0""flush\0"; int command_num = 2; /* default command is list */ diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 69ce84e..e1c9c60 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -171,7 +171,7 @@ static int do_set(int argc, char **argv) struct ifreq ifr0, ifr1; char *newname = NULL; int htype, halen; - static const char keywords[] = + static const char keywords[] ALIGN1 = "up\0""down\0""name\0""mtu\0""multicast\0""arp\0""addr\0""dev\0" "on\0""off\0"; enum { ARG_up = 1, ARG_down, ARG_name, ARG_mtu, ARG_multicast, ARG_arp, @@ -275,7 +275,7 @@ static int ipaddr_list_link(int argc, char **argv) /* Return value becomes exitcode. It's okay to not return at all */ int do_iplink(int argc, char **argv) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "set\0""show\0""lst\0""list\0"; smalluint key; if (argc <= 0) diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 0d171c7..fbc7210 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -294,7 +294,7 @@ static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED, /* Return value becomes exitcode. It's okay to not return at all */ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "src\0""via\0""mtu\0""lock\0""protocol\0"USE_FEATURE_IP_RULE("table\0") "dev\0""oif\0""to\0"; enum { @@ -489,7 +489,7 @@ static int rtnl_rtcache_request(struct rtnl_handle *rth, int family) static void iproute_flush_cache(void) { - static const char fn[] = "/proc/sys/net/ipv4/route/flush"; + static const char fn[] ALIGN1 = "/proc/sys/net/ipv4/route/flush"; int flush_fd = open_or_warn(fn, O_WRONLY); if (flush_fd < 0) { @@ -517,7 +517,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) struct rtnl_handle rth; char *id = NULL; char *od = NULL; - static const char keywords[] = + static const char keywords[] ALIGN1 = "protocol\0""all\0""dev\0""oif\0""iif\0""via\0""table\0""cache\0" /*all*/ "from\0""root\0""match\0""exact\0""to\0"/*root match exact*/; enum { @@ -679,7 +679,7 @@ static int iproute_get(int argc, char **argv) char *odev = NULL; bool connected = 0; bool from_ok = 0; - static const char options[] = + static const char options[] ALIGN1 = "from\0""iif\0""oif\0""dev\0""notify\0""connected\0""to\0"; memset(&req, 0, sizeof(req)); @@ -824,7 +824,7 @@ static int iproute_get(int argc, char **argv) /* Return value becomes exitcode. It's okay to not return at all */ int do_iproute(int argc, char **argv) { - static const char ip_route_commands[] = + static const char ip_route_commands[] ALIGN1 = /*0-3*/ "add\0""append\0""change\0""chg\0" /*4-7*/ "delete\0""get\0""list\0""show\0" /*8..*/ "prepend\0""replace\0""test\0""flush\0"; diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index 8e2a06f..18ae6b5 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c @@ -187,7 +187,7 @@ static int iprule_list(int argc, char **argv) /* Return value becomes exitcode. It's okay to not return at all */ static int iprule_modify(int cmd, int argc, char **argv) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "from\0""to\0""preference\0""order\0""priority\0" "tos\0""fwmark\0""realms\0""table\0""lookup\0""dev\0" "iif\0""nat\0""map-to\0""type\0""help\0"; @@ -313,7 +313,7 @@ static int iprule_modify(int cmd, int argc, char **argv) /* Return value becomes exitcode. It's okay to not return at all */ int do_iprule(int argc, char **argv) { - static const char ip_rule_commands[] = + static const char ip_rule_commands[] ALIGN1 = "add\0""delete\0""list\0""show\0"; int cmd = 2; /* list */ diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index a293387..2b17135 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -128,7 +128,7 @@ static int do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p) /* Dies on error */ static void parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "mode\0""ipip\0""ip/ip\0""gre\0""gre/ip\0""sit\0""ipv6/ip\0" "key\0""ikey\0""okey\0""seq\0""iseq\0""oseq\0" "csum\0""icsum\0""ocsum\0""nopmtudisc\0""pmtudisc\0" @@ -519,7 +519,7 @@ static int do_show(int argc, char **argv) /* Return value becomes exitcode. It's okay to not return at all */ int do_iptunnel(int argc, char **argv) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "add\0""change\0""delete\0""show\0""list\0""lst\0"; enum { ARG_add = 0, ARG_change, ARG_del, ARG_show, ARG_list, ARG_lst }; int key; diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index e8a8279..7b5de92 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c @@ -131,7 +131,7 @@ unsigned ll_index_to_flags(int idx) return 0; } -int xll_name_to_index(const char * const name) +int xll_name_to_index(const char *const name) { int ret = 0; int sock_fd; diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h index 2dfc844..55e2cf3 100644 --- a/networking/libiproute/ll_map.h +++ b/networking/libiproute/ll_map.h @@ -4,7 +4,7 @@ int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); int ll_init_map(struct rtnl_handle *rth); -int xll_name_to_index(const char * const name); +int xll_name_to_index(const char *const name); const char *ll_index_to_name(int idx); const char *ll_idx_n2a(int idx, char *buf); /* int ll_index_to_type(int idx); */ diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c index 96b2d17..ca2f443 100644 --- a/networking/libiproute/rtm_map.c +++ b/networking/libiproute/rtm_map.c @@ -51,7 +51,7 @@ const char *rtnl_rtntype_n2a(int id, char *buf, int len) int rtnl_rtntype_a2n(int *id, char *arg) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "local\0""nat\0""broadcast\0""brd\0""anycast\0" "multicast\0""prohibit\0""unreachable\0""blackhole\0" "xresolve\0""unicast\0""throw\0"; |