diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-22 18:09:21 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-22 18:09:21 +0200 |
commit | 3e134ebf6afb5552b3619f98f6a2ffa01a07eebb (patch) | |
tree | 6cafe5f8e63a88e4ab7b2a449dc62dd3afb3c8bf /networking | |
parent | 663d1da1e68b15397c00d6a094f78c2cf08358ea (diff) | |
download | busybox-w32-3e134ebf6afb5552b3619f98f6a2ffa01a07eebb.tar.gz busybox-w32-3e134ebf6afb5552b3619f98f6a2ffa01a07eebb.tar.bz2 busybox-w32-3e134ebf6afb5552b3619f98f6a2ffa01a07eebb.zip |
*: slap on a few ALIGN1/2s where appropriate
The result of looking at "grep -F -B2 '*fill*' busybox_unstripped.map"
text data bss dec hex filename
829901 4086 1904 835891 cc133 busybox_before
829665 4086 1904 835655 cc047 busybox
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/libiproute/ipneigh.c | 2 | ||||
-rw-r--r-- | networking/libiproute/ll_proto.c | 2 | ||||
-rw-r--r-- | networking/libiproute/ll_types.c | 4 | ||||
-rw-r--r-- | networking/telnetd.ctrlSQ.patch | 4 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/networking/libiproute/ipneigh.c b/networking/libiproute/ipneigh.c index d2028b7b6..2a1c20e20 100644 --- a/networking/libiproute/ipneigh.c +++ b/networking/libiproute/ipneigh.c | |||
@@ -62,7 +62,7 @@ static unsigned nud_state_a2n(char *arg) | |||
62 | "stale\0" "incomplete\0" "delay\0" "probe\0" | 62 | "stale\0" "incomplete\0" "delay\0" "probe\0" |
63 | "failed\0" | 63 | "failed\0" |
64 | ; | 64 | ; |
65 | static uint8_t nuds[] = { | 65 | static uint8_t nuds[] ALIGN1 = { |
66 | NUD_PERMANENT,NUD_REACHABLE, NUD_NOARP,NUD_NONE, | 66 | NUD_PERMANENT,NUD_REACHABLE, NUD_NOARP,NUD_NONE, |
67 | NUD_STALE, NUD_INCOMPLETE,NUD_DELAY,NUD_PROBE, | 67 | NUD_STALE, NUD_INCOMPLETE,NUD_DELAY,NUD_PROBE, |
68 | NUD_FAILED | 68 | NUD_FAILED |
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index da2b53cbf..4c32ae574 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c | |||
@@ -84,7 +84,7 @@ ETH_P_IP | |||
84 | 84 | ||
85 | /* Keep declarations above and below in sync! */ | 85 | /* Keep declarations above and below in sync! */ |
86 | 86 | ||
87 | static const char llproto_names[] = | 87 | static const char llproto_names[] ALIGN1 = |
88 | #define __PF(f,n) #n "\0" | 88 | #define __PF(f,n) #n "\0" |
89 | __PF(LOOP,loop) | 89 | __PF(LOOP,loop) |
90 | __PF(PUP,pup) | 90 | __PF(PUP,pup) |
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c index bb42e269e..62ee0cc54 100644 --- a/networking/libiproute/ll_types.c +++ b/networking/libiproute/ll_types.c | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | const char* FAST_FUNC ll_type_n2a(int type, char *buf) | 17 | const char* FAST_FUNC ll_type_n2a(int type, char *buf) |
18 | { | 18 | { |
19 | static const char arphrd_name[] = | 19 | static const char arphrd_name[] ALIGN1 = |
20 | /* 0, */ "generic" "\0" | 20 | /* 0, */ "generic" "\0" |
21 | /* ARPHRD_LOOPBACK, */ "loopback" "\0" | 21 | /* ARPHRD_LOOPBACK, */ "loopback" "\0" |
22 | /* ARPHRD_ETHER, */ "ether" "\0" | 22 | /* ARPHRD_ETHER, */ "ether" "\0" |
@@ -105,7 +105,7 @@ const char* FAST_FUNC ll_type_n2a(int type, char *buf) | |||
105 | 105 | ||
106 | /* Keep these arrays in sync! */ | 106 | /* Keep these arrays in sync! */ |
107 | 107 | ||
108 | static const uint16_t arphrd_type[] = { | 108 | static const uint16_t arphrd_type[] ALIGN2 = { |
109 | 0, /* "generic" "\0" */ | 109 | 0, /* "generic" "\0" */ |
110 | ARPHRD_LOOPBACK, /* "loopback" "\0" */ | 110 | ARPHRD_LOOPBACK, /* "loopback" "\0" */ |
111 | ARPHRD_ETHER, /* "ether" "\0" */ | 111 | ARPHRD_ETHER, /* "ether" "\0" */ |
diff --git a/networking/telnetd.ctrlSQ.patch b/networking/telnetd.ctrlSQ.patch index 7060e1c6e..bc26d2279 100644 --- a/networking/telnetd.ctrlSQ.patch +++ b/networking/telnetd.ctrlSQ.patch | |||
@@ -94,9 +94,9 @@ exceptional conditions. | |||
94 | #endif | 94 | #endif |
95 | +#ifdef TIOCPKT | 95 | +#ifdef TIOCPKT |
96 | + int control; | 96 | + int control; |
97 | + static const char lflow_on[] = | 97 | + static const char lflow_on[] ALIGN1 = |
98 | + {IAC, SB, TELOPT_LFLOW, LFLOW_ON, IAC, SE}; | 98 | + {IAC, SB, TELOPT_LFLOW, LFLOW_ON, IAC, SE}; |
99 | + static const char lflow_off[] = | 99 | + static const char lflow_off[] ALIGN1 = |
100 | + {IAC, SB, TELOPT_LFLOW, LFLOW_OFF, IAC, SE}; | 100 | + {IAC, SB, TELOPT_LFLOW, LFLOW_OFF, IAC, SE}; |
101 | +# define RESERVED sizeof(lflow_on) | 101 | +# define RESERVED sizeof(lflow_on) |
102 | +#else | 102 | +#else |
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 8f5a03f2e..fc7b6216d 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -109,7 +109,7 @@ enum { | |||
109 | /*** Script execution code ***/ | 109 | /*** Script execution code ***/ |
110 | 110 | ||
111 | /* get a rough idea of how long an option will be (rounding up...) */ | 111 | /* get a rough idea of how long an option will be (rounding up...) */ |
112 | static const uint8_t len_of_option_as_string[] = { | 112 | static const uint8_t len_of_option_as_string[] ALIGN1 = { |
113 | [OPTION_IP ] = sizeof("255.255.255.255 "), | 113 | [OPTION_IP ] = sizeof("255.255.255.255 "), |
114 | [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2, | 114 | [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2, |
115 | [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "), | 115 | [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "), |
diff --git a/networking/wget.c b/networking/wget.c index 5c12423c7..28c12540b 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -146,10 +146,10 @@ struct host_info { | |||
146 | char *host; | 146 | char *host; |
147 | int port; | 147 | int port; |
148 | }; | 148 | }; |
149 | static const char P_FTP[] = "ftp"; | 149 | static const char P_FTP[] ALIGN1 = "ftp"; |
150 | static const char P_HTTP[] = "http"; | 150 | static const char P_HTTP[] ALIGN1 = "http"; |
151 | #if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER | 151 | #if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER |
152 | static const char P_HTTPS[] = "https"; | 152 | static const char P_HTTPS[] ALIGN1 = "https"; |
153 | #endif | 153 | #endif |
154 | 154 | ||
155 | #if ENABLE_FEATURE_WGET_LONG_OPTIONS | 155 | #if ENABLE_FEATURE_WGET_LONG_OPTIONS |