diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-13 00:58:27 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-13 00:58:27 +0400 |
commit | 6ca409e0e4c198fe3081346eebbae3f068fe605a (patch) | |
tree | 060cb05d99220a1eda399194d1209c269f0e8cd8 /networking | |
parent | 4185548984357df91311f30c8e43d95f33922576 (diff) |
trylink: produce even more info about final link stage
trylink: explain how to modify link and drastically decrease amount
of padding (unfortunately, needs hand editing ATM).
*: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts
size saving: 0.5k
Diffstat (limited to 'networking')
-rw-r--r-- | networking/arp.c | 2 | ||||
-rw-r--r-- | networking/ftpgetput.c | 2 | ||||
-rw-r--r-- | networking/httpd.c | 18 | ||||
-rw-r--r-- | networking/interface.c | 10 | ||||
-rw-r--r-- | networking/ip.c | 2 | ||||
-rw-r--r-- | networking/ipcalc.c | 2 | ||||
-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 | ||||
-rw-r--r-- | networking/netstat.c | 3 | ||||
-rw-r--r-- | networking/route.c | 14 | ||||
-rw-r--r-- | networking/slattach.c | 2 | ||||
-rw-r--r-- | networking/telnet.c | 2 | ||||
-rw-r--r-- | networking/tftp.c | 4 | ||||
-rw-r--r-- | networking/traceroute.c | 2 | ||||
-rw-r--r-- | networking/udhcp/common.c | 4 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dumpleases.c | 2 | ||||
-rw-r--r-- | networking/udhcp/options.c | 2 | ||||
-rw-r--r-- | networking/vconfig.c | 6 | ||||
-rw-r--r-- | networking/wget.c | 6 |
27 files changed, 62 insertions, 59 deletions
diff --git a/networking/arp.c b/networking/arp.c index 907433b4a..a5a737349 100644 --- a/networking/arp.c +++ b/networking/arp.c @@ -46,7 +46,7 @@ static int sockfd; /* active socket descriptor */ static smallint hw_set; /* flag if hw-type was set (-H) */ static const char *device = ""; /* current device */ -static const char options[] = +static const char options[] ALIGN1 = "pub\0" "priv\0" "temp\0" diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 02e7c5270..f3d6009dd 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c @@ -287,7 +287,7 @@ int ftp_send(ftp_host_info_t *server, FILE *control_stream, #define FTPGETPUT_OPT_PORT 16 #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS -static const char ftpgetput_longopts[] = +static const char ftpgetput_longopts[] ALIGN1 = "continue\0" Required_argument "c" "verbose\0" No_argument "v" "username\0" Required_argument "u" diff --git a/networking/httpd.c b/networking/httpd.c index fb3129f0b..b083d645c 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -98,8 +98,8 @@ # define PIPE_BUF 4096 #endif -static const char default_path_httpd_conf[] = "/etc"; -static const char httpd_conf[] = "httpd.conf"; +static const char default_path_httpd_conf[] ALIGN1 = "/etc"; +static const char httpd_conf[] ALIGN1 = "httpd.conf"; #define TIMEOUT 60 @@ -202,9 +202,9 @@ struct globals { ContentLength = -1; \ } while (0) -static const char request_GET[] = "GET"; /* size algorithmic optimize */ +static const char request_GET[] ALIGN1 = "GET"; /* size algorithmic optimize */ -static const char* const suffixTable [] = { +static const char *const suffixTable[] = { /* Warning: shorted equivalent suffix in one line must be first */ ".htm.html", "text/html", ".jpg.jpeg", "image/jpeg", @@ -288,7 +288,7 @@ static const HttpEnumString httpResponseNames[] = { }; -static const char RFC1123FMT[] = "%a, %d %b %Y %H:%M:%S GMT"; +static const char RFC1123FMT[] ALIGN1 = "%a, %d %b %Y %H:%M:%S GMT"; #define STRNCASECMP(a, str) strncasecmp((a), (str), sizeof(str)-1) @@ -1268,7 +1268,7 @@ static int sendCgi(const char *url, * <cr><lf> pair here. We will output "200 OK" line * if needed, but CGI still has to provide blank line * between header and body */ - static const char HTTP_200[] = "HTTP/1.0 200 OK\r\n"; + static const char HTTP_200[] ALIGN1 = "HTTP/1.0 200 OK\r\n"; /* Must use safe_read, not full_read, because * CGI may output a few first bytes and then wait @@ -1343,9 +1343,9 @@ static int sendCgi(const char *url, static int sendFile(const char *url) { char * suffix; - int f; - const char * const * table; - const char * try_suffix; + int f; + const char *const *table; + const char *try_suffix; suffix = strrchr(url, '.'); diff --git a/networking/interface.c b/networking/interface.c index 9e6ed63e0..61ce12ef1 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -871,7 +871,7 @@ static int hw_null_address(const struct hwtype *hw, void *ap) return 1; } -static const char TRext[] = "\0\0\0Ki\0Mi\0Gi\0Ti"; +static const char TRext[] ALIGN1 = "\0\0\0Ki\0Mi\0Gi\0Ti"; static void print_bytes_scaled(unsigned long long ull, const char *end) { @@ -1020,7 +1020,7 @@ static void ife_print(struct interface *ptr) if (ptr->flags == 0) { printf("[NO FLAGS] "); } else { - static const char ife_print_flags_strs[] = + static const char ife_print_flags_strs[] ALIGN1 = "UP\0" "BROADCAST\0" "DEBUG\0" @@ -1038,7 +1038,7 @@ static void ife_print(struct interface *ptr) "DYNAMIC\0" #endif ; - static const unsigned short ife_print_flags_mask[] = { + static const unsigned short ife_print_flags_mask[] ALIGN2 = { IFF_UP, IFF_BROADCAST, IFF_DEBUG, @@ -1051,9 +1051,9 @@ static void ife_print(struct interface *ptr) IFF_ALLMULTI, IFF_SLAVE, IFF_MASTER, - IFF_MULTICAST, + IFF_MULTICAST #ifdef HAVE_DYNAMIC - IFF_DYNAMIC, + ,IFF_DYNAMIC #endif }; const unsigned short *mask = ife_print_flags_mask; diff --git a/networking/ip.c b/networking/ip.c index bf7e84c53..c82d731c1 100644 --- a/networking/ip.c +++ b/networking/ip.c @@ -82,7 +82,7 @@ int iptunnel_main(int argc, char **argv) int ip_main(int argc, char **argv); int ip_main(int argc, char **argv) { - static const char keywords[] = + static const char keywords[] ALIGN1 = USE_FEATURE_IP_ADDRESS("address\0") USE_FEATURE_IP_ROUTE("route\0") USE_FEATURE_IP_LINK("link\0") diff --git a/networking/ipcalc.c b/networking/ipcalc.c index f3e3ad98f..2a099eff0 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c @@ -63,7 +63,7 @@ int get_prefix(unsigned long netmask); #define SILENT 0x20 #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS - static const char ipcalc_longopts[] = + static const char ipcalc_longopts[] ALIGN1 = "netmask\0" No_argument "m" "broadcast\0" No_argument "b" "network\0" No_argument "n" diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index 0e429a06f..ff333993f 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 8874fdb0a..6a5f2cfbd 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 69ce84e49..e1c9c6043 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 0d171c785..fbc721049 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 8e2a06f4f..18ae6b5ef 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 a2933879c..2b1713556 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 e8a8279b0..7b5de92c2 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 2dfc84422..55e2cf393 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 96b2d1791..ca2f4436a 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"; diff --git a/networking/netstat.c b/networking/netstat.c index 746e25091..014e5e251 100644 --- a/networking/netstat.c +++ b/networking/netstat.c @@ -47,8 +47,7 @@ enum { TCP_CLOSING /* now a valid state */ }; -static const char * const tcp_state[] = -{ +static const char *const tcp_state[] = { "", "ESTABLISHED", "SYN_SENT", diff --git a/networking/route.c b/networking/route.c index 530c51b10..bfa58da2a 100644 --- a/networking/route.c +++ b/networking/route.c @@ -73,7 +73,7 @@ #define HOST_FLAG 2 /* We remap '-' to '#' to avoid problems with getopt. */ -static const char tbl_hash_net_host[] = +static const char tbl_hash_net_host[] ALIGN1 = "\007\001#net\0" /* "\010\002#host\0" */ "\007\002#host" /* Since last, we can save a byte. */ @@ -96,7 +96,7 @@ static const char tbl_hash_net_host[] = #define KW_IPVx_DYN 042 #define KW_IPVx_REINSTATE 043 -static const char tbl_ipvx[] = +static const char tbl_ipvx[] ALIGN1 = /* 020 is the "takes an arg" bit */ #if HAVE_NEW_ADDRT "\011\020metric\0" @@ -438,7 +438,7 @@ static void INET6_setroute(int action, char **args) } #endif -static const unsigned int flagvals[] = { /* Must agree with flagchars[]. */ +static const unsigned flagvals[] = { /* Must agree with flagchars[]. */ RTF_GATEWAY, RTF_HOST, RTF_REINSTATE, @@ -454,7 +454,8 @@ static const unsigned int flagvals[] = { /* Must agree with flagchars[]. */ #define IPV4_MASK (RTF_GATEWAY|RTF_HOST|RTF_REINSTATE|RTF_DYNAMIC|RTF_MODIFIED) #define IPV6_MASK (RTF_GATEWAY|RTF_HOST|RTF_DEFAULT|RTF_ADDRCONF|RTF_CACHE) -static const char flagchars[] = /* Must agree with flagvals[]. */ +/* Must agree with flagvals[]. */ +static const char flagchars[] ALIGN1 = "GHRDM" #if ENABLE_FEATURE_IPV6 "DAC" @@ -631,11 +632,12 @@ static void INET6_displayroutes(int noresolve) #define ROUTE_OPT_INET6 0x08 /* Not an actual option. See below. */ /* 1st byte is offset to next entry offset. 2nd byte is return value. */ -static const char tbl_verb[] = /* 2nd byte matches RTACTION_* code */ +/* 2nd byte matches RTACTION_* code */ +static const char tbl_verb[] ALIGN1 = "\006\001add\0" "\006\002del\0" /* "\011\002delete\0" */ - "\010\002delete" /* Since last, we can save a byte. */ + "\010\002delete" /* Since it's last, we can save a byte. */ ; int route_main(int argc, char **argv); diff --git a/networking/slattach.c b/networking/slattach.c index 4bac879d2..f78c88e89 100644 --- a/networking/slattach.c +++ b/networking/slattach.c @@ -123,7 +123,7 @@ int slattach_main(int argc, char **argv); int slattach_main(int argc, char **argv) { /* Line discipline code table */ - static const char proto_names[] = + static const char proto_names[] ALIGN1 = "slip\0" /* 0 */ "cslip\0" /* 1 */ "slip6\0" /* 2 */ diff --git a/networking/telnet.c b/networking/telnet.c index a634d7a2b..4e8b27ba6 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -353,7 +353,7 @@ static void putiac_naws(byte c, int x, int y) } #endif -static char const escapecharis[] = "\r\nEscape character is "; +static char const escapecharis[] ALIGN1 = "\r\nEscape character is "; static void setConMode(void) { diff --git a/networking/tftp.c b/networking/tftp.c index b20486cc1..85d1a857f 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -278,7 +278,7 @@ static int tftp( USE_GETPUT(const int cmd,) "unknown transfer id", "file already exists", "no such user", - "bad option", + "bad option" }; const char *msg = ""; @@ -309,7 +309,7 @@ static int tftp( USE_GETPUT(const int cmd,) /* htons can be impossible to use in const initializer: */ /*static const uint16_t error_8[2] = { htons(TFTP_ERROR), htons(8) };*/ /* thus we open-code big-endian layout */ - static const char error_8[4] = { 0,TFTP_ERROR, 0,8 }; + static const uint8_t error_8[4] = { 0,TFTP_ERROR, 0,8 }; xsendto(socketfd, error_8, 4, &peer_lsa->sa, peer_lsa->len); bb_error_msg("server proposes bad blksize %d, exiting", blksize); goto ret; diff --git a/networking/traceroute.c b/networking/traceroute.c index c87f7ffc5..20f304d53 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -700,7 +700,7 @@ send_probe(int seq, int ttl) static inline const char * pr_type(unsigned char t) { - static const char * const ttab[] = { + static const char *const ttab[] = { "Echo Reply", "ICMP 1", "ICMP 2", "Dest Unreachable", "Source Quench", "Redirect", "ICMP 6", "ICMP 7", "Echo", "Router Advert", "Router Solicit", "Time Exceeded", diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index 59c015575..a47bbafff 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c @@ -6,4 +6,6 @@ #include "common.h" -const uint8_t MAC_BCAST_ADDR[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +const uint8_t MAC_BCAST_ADDR[6] ALIGN2 = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index efe208814..0e89c3cae 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -180,7 +180,7 @@ int udhcpc_main(int argc, char **argv) OPT_v = 1 << 17, }; #if ENABLE_GETOPT_LONG - static const char udhcpc_longopts[] = + static const char udhcpc_longopts[] ALIGN1 = "clientid\0" Required_argument "c" "clientid-none\0" No_argument "C" "vendorclass\0" Required_argument "V" diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index f9f923124..a0765be79 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c @@ -24,7 +24,7 @@ int dumpleases_main(int argc, char **argv) OPT_f = 0x4, // -f }; #if ENABLE_GETOPT_LONG - static const char dumpleases_longopts[] = + static const char dumpleases_longopts[] ALIGN1 = "absolute\0" No_argument "a" "remaining\0" No_argument "r" "file\0" Required_argument "f" diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c index a58adb9a9..3168fc69a 100644 --- a/networking/udhcp/options.c +++ b/networking/udhcp/options.c @@ -52,7 +52,7 @@ const struct dhcp_option dhcp_options[] = { }; /* Lengths of the different option types */ -const unsigned char option_lengths[] = { +const unsigned char option_lengths[] ALIGN1 = { [OPTION_IP] = 4, [OPTION_IP_PAIR] = 8, [OPTION_BOOLEAN] = 1, diff --git a/networking/vconfig.c b/networking/vconfig.c index 4776e1324..8bd88701f 100644 --- a/networking/vconfig.c +++ b/networking/vconfig.c @@ -63,7 +63,7 @@ static const char *xfind_str(const char *table, const char *str) return table - 1; } -static const char cmds[] = { +static const char cmds[] ALIGN1 = { 4, ADD_VLAN_CMD, 7, 'a', 'd', 'd', 0, 3, DEL_VLAN_CMD, 7, @@ -85,7 +85,7 @@ static const char cmds[] = { 'm', 'a', 'p', 0, }; -static const char name_types[] = { +static const char name_types[] ALIGN1 = { VLAN_NAME_TYPE_PLUS_VID, 16, 'V', 'L', 'A', 'N', '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D', @@ -104,7 +104,7 @@ static const char name_types[] = { '_', 'N', 'O', '_', 'P', 'A', 'D', 0, }; -static const char conf_file_name[] = "/proc/net/vlan/config"; +static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config"; int vconfig_main(int argc, char **argv); int vconfig_main(int argc, char **argv) diff --git a/networking/wget.c b/networking/wget.c index 7b583c7ab..d90368c40 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -114,7 +114,7 @@ int wget_main(int argc, char **argv) bool use_proxy = 1; /* Use proxies if env vars are set */ const char *proxy_flag = "on"; /* Use proxies if env vars are set */ const char *user_agent = "Wget";/* "User-Agent" header field */ - static const char keywords[] = + static const char keywords[] ALIGN1 = "content-length\0""transfer-encoding\0""chunked\0""location\0"; enum { KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location @@ -131,7 +131,7 @@ int wget_main(int argc, char **argv) WGET_OPT_HEADER = 0x100, }; #if ENABLE_FEATURE_WGET_LONG_OPTIONS - static const char wget_longopts[] = + static const char wget_longopts[] ALIGN1 = /* name, has_arg, val */ "continue\0" No_argument "c" "spider\0" No_argument "s" @@ -539,7 +539,7 @@ static void parse_url(char *src_url, struct host_info *h) p = strchr(h->host, '#'); if (!sp || (p && sp > p)) sp = p; if (!sp) { /* must be writable because of bb_get_last_path_component() */ - static char nullstr[] = ""; + static char nullstr[] ALIGN1 = ""; h->path = nullstr; } else if (*sp == '/') { *sp = '\0'; |