diff options
Diffstat (limited to 'networking')
-rw-r--r-- | networking/arp.c | 2 | ||||
-rw-r--r-- | networking/arping.c | 2 | ||||
-rw-r--r-- | networking/ftpd.c | 2 | ||||
-rw-r--r-- | networking/ftpgetput.c | 2 | ||||
-rw-r--r-- | networking/ifupdown.c | 2 | ||||
-rw-r--r-- | networking/inetd.c | 2 | ||||
-rw-r--r-- | networking/ping.c | 2 | ||||
-rw-r--r-- | networking/slattach.c | 2 | ||||
-rw-r--r-- | networking/tc.c | 3 | ||||
-rw-r--r-- | networking/tcpudp.c | 2 | ||||
-rw-r--r-- | networking/telnet.c | 2 | ||||
-rw-r--r-- | networking/telnetd.c | 2 | ||||
-rw-r--r-- | networking/tftp.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 2 | ||||
-rw-r--r-- | networking/zcip.c | 2 |
15 files changed, 15 insertions, 16 deletions
diff --git a/networking/arp.c b/networking/arp.c index 278f2dc9a..0ef267a35 100644 --- a/networking/arp.c +++ b/networking/arp.c | |||
@@ -51,7 +51,7 @@ struct globals { | |||
51 | const char *device; /* current device */ | 51 | const char *device; /* current device */ |
52 | smallint hw_set; /* flag if hw-type was set (-H) */ | 52 | smallint hw_set; /* flag if hw-type was set (-H) */ |
53 | 53 | ||
54 | }; | 54 | } FIX_ALIASING; |
55 | #define G (*(struct globals*)&bb_common_bufsiz1) | 55 | #define G (*(struct globals*)&bb_common_bufsiz1) |
56 | #define ap (G.ap ) | 56 | #define ap (G.ap ) |
57 | #define hw (G.hw ) | 57 | #define hw (G.hw ) |
diff --git a/networking/arping.c b/networking/arping.c index e3418a945..effe418a6 100644 --- a/networking/arping.c +++ b/networking/arping.c | |||
@@ -45,7 +45,7 @@ struct globals { | |||
45 | unsigned received; | 45 | unsigned received; |
46 | unsigned brd_recv; | 46 | unsigned brd_recv; |
47 | unsigned req_recv; | 47 | unsigned req_recv; |
48 | }; | 48 | } FIX_ALIASING; |
49 | #define G (*(struct globals*)&bb_common_bufsiz1) | 49 | #define G (*(struct globals*)&bb_common_bufsiz1) |
50 | #define src (G.src ) | 50 | #define src (G.src ) |
51 | #define dst (G.dst ) | 51 | #define dst (G.dst ) |
diff --git a/networking/ftpd.c b/networking/ftpd.c index b7d5b20b1..186ff50ce 100644 --- a/networking/ftpd.c +++ b/networking/ftpd.c | |||
@@ -106,7 +106,7 @@ struct globals { | |||
106 | /* We need these aligned to uint32_t */ | 106 | /* We need these aligned to uint32_t */ |
107 | char msg_ok [(sizeof("NNN " MSG_OK ) + 3) & 0xfffc]; | 107 | char msg_ok [(sizeof("NNN " MSG_OK ) + 3) & 0xfffc]; |
108 | char msg_err[(sizeof("NNN " MSG_ERR) + 3) & 0xfffc]; | 108 | char msg_err[(sizeof("NNN " MSG_ERR) + 3) & 0xfffc]; |
109 | }; | 109 | } FIX_ALIASING; |
110 | #define G (*(struct globals*)&bb_common_bufsiz1) | 110 | #define G (*(struct globals*)&bb_common_bufsiz1) |
111 | #define INIT_G() do { \ | 111 | #define INIT_G() do { \ |
112 | /* Moved to main */ \ | 112 | /* Moved to main */ \ |
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 2dd7e9232..120ccff83 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c | |||
@@ -23,7 +23,7 @@ struct globals { | |||
23 | int verbose_flag; | 23 | int verbose_flag; |
24 | int do_continue; | 24 | int do_continue; |
25 | char buf[1]; /* actually [BUFSZ] */ | 25 | char buf[1]; /* actually [BUFSZ] */ |
26 | }; | 26 | } FIX_ALIASING; |
27 | #define G (*(struct globals*)&bb_common_bufsiz1) | 27 | #define G (*(struct globals*)&bb_common_bufsiz1) |
28 | enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) }; | 28 | enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) }; |
29 | struct BUG_G_too_big { | 29 | struct BUG_G_too_big { |
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 51b36263f..bf88b1c19 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -106,7 +106,7 @@ enum { | |||
106 | struct globals { | 106 | struct globals { |
107 | char **my_environ; | 107 | char **my_environ; |
108 | const char *startup_PATH; | 108 | const char *startup_PATH; |
109 | }; | 109 | } FIX_ALIASING; |
110 | #define G (*(struct globals*)&bb_common_bufsiz1) | 110 | #define G (*(struct globals*)&bb_common_bufsiz1) |
111 | #define INIT_G() do { } while (0) | 111 | #define INIT_G() do { } while (0) |
112 | 112 | ||
diff --git a/networking/inetd.c b/networking/inetd.c index a45573396..7aa6b7b19 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -313,7 +313,7 @@ struct globals { | |||
313 | fd_set allsock; | 313 | fd_set allsock; |
314 | /* Used in next_line(), and as scratch read buffer */ | 314 | /* Used in next_line(), and as scratch read buffer */ |
315 | char line[256]; /* _at least_ 256, see LINE_SIZE */ | 315 | char line[256]; /* _at least_ 256, see LINE_SIZE */ |
316 | }; | 316 | } FIX_ALIASING; |
317 | #define G (*(struct globals*)&bb_common_bufsiz1) | 317 | #define G (*(struct globals*)&bb_common_bufsiz1) |
318 | enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) }; | 318 | enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) }; |
319 | struct BUG_G_too_big { | 319 | struct BUG_G_too_big { |
diff --git a/networking/ping.c b/networking/ping.c index 23b39f2e2..467b7f694 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -263,7 +263,7 @@ struct globals { | |||
263 | #endif | 263 | #endif |
264 | } pingaddr; | 264 | } pingaddr; |
265 | char rcvd_tbl[MAX_DUP_CHK / 8]; | 265 | char rcvd_tbl[MAX_DUP_CHK / 8]; |
266 | }; | 266 | } FIX_ALIASING; |
267 | #define G (*(struct globals*)&bb_common_bufsiz1) | 267 | #define G (*(struct globals*)&bb_common_bufsiz1) |
268 | #define pingsock (G.pingsock ) | 268 | #define pingsock (G.pingsock ) |
269 | #define if_index (G.if_index ) | 269 | #define if_index (G.if_index ) |
diff --git a/networking/slattach.c b/networking/slattach.c index d3212bb40..12a3067de 100644 --- a/networking/slattach.c +++ b/networking/slattach.c | |||
@@ -20,7 +20,7 @@ struct globals { | |||
20 | int handle; | 20 | int handle; |
21 | int saved_disc; | 21 | int saved_disc; |
22 | struct termios saved_state; | 22 | struct termios saved_state; |
23 | }; | 23 | } FIX_ALIASING; |
24 | #define G (*(struct globals*)&bb_common_bufsiz1) | 24 | #define G (*(struct globals*)&bb_common_bufsiz1) |
25 | #define handle (G.handle ) | 25 | #define handle (G.handle ) |
26 | #define saved_disc (G.saved_disc ) | 26 | #define saved_disc (G.saved_disc ) |
diff --git a/networking/tc.c b/networking/tc.c index 541a0f8f4..6a5a8504f 100644 --- a/networking/tc.c +++ b/networking/tc.c | |||
@@ -43,8 +43,7 @@ struct globals { | |||
43 | __u32 filter_parent; | 43 | __u32 filter_parent; |
44 | __u32 filter_prio; | 44 | __u32 filter_prio; |
45 | __u32 filter_proto; | 45 | __u32 filter_proto; |
46 | }; | 46 | } FIX_ALIASING; |
47 | |||
48 | #define G (*(struct globals*)&bb_common_bufsiz1) | 47 | #define G (*(struct globals*)&bb_common_bufsiz1) |
49 | #define filter_ifindex (G.filter_ifindex) | 48 | #define filter_ifindex (G.filter_ifindex) |
50 | #define filter_qdisc (G.filter_qdisc) | 49 | #define filter_qdisc (G.filter_qdisc) |
diff --git a/networking/tcpudp.c b/networking/tcpudp.c index d0db33b79..42845df0e 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c | |||
@@ -50,7 +50,7 @@ struct globals { | |||
50 | unsigned cmax; | 50 | unsigned cmax; |
51 | char **env_cur; | 51 | char **env_cur; |
52 | char *env_var[1]; /* actually bigger */ | 52 | char *env_var[1]; /* actually bigger */ |
53 | }; | 53 | } FIX_ALIASING; |
54 | #define G (*(struct globals*)&bb_common_bufsiz1) | 54 | #define G (*(struct globals*)&bb_common_bufsiz1) |
55 | #define verbose (G.verbose ) | 55 | #define verbose (G.verbose ) |
56 | #define max_per_host (G.max_per_host) | 56 | #define max_per_host (G.max_per_host) |
diff --git a/networking/telnet.c b/networking/telnet.c index 013d959a1..344bb0daa 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -75,7 +75,7 @@ struct globals { | |||
75 | char iacbuf[IACBUFSIZE]; | 75 | char iacbuf[IACBUFSIZE]; |
76 | struct termios termios_def; | 76 | struct termios termios_def; |
77 | struct termios termios_raw; | 77 | struct termios termios_raw; |
78 | }; | 78 | } FIX_ALIASING; |
79 | #define G (*(struct globals*)&bb_common_bufsiz1) | 79 | #define G (*(struct globals*)&bb_common_bufsiz1) |
80 | #define INIT_G() do { \ | 80 | #define INIT_G() do { \ |
81 | struct G_sizecheck { \ | 81 | struct G_sizecheck { \ |
diff --git a/networking/telnetd.c b/networking/telnetd.c index b0a1cc4d8..dd59de9d4 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
@@ -60,7 +60,7 @@ struct globals { | |||
60 | const char *loginpath; | 60 | const char *loginpath; |
61 | const char *issuefile; | 61 | const char *issuefile; |
62 | int maxfd; | 62 | int maxfd; |
63 | }; | 63 | } FIX_ALIASING; |
64 | #define G (*(struct globals*)&bb_common_bufsiz1) | 64 | #define G (*(struct globals*)&bb_common_bufsiz1) |
65 | #define INIT_G() do { \ | 65 | #define INIT_G() do { \ |
66 | G.loginpath = "/bin/login"; \ | 66 | G.loginpath = "/bin/login"; \ |
diff --git a/networking/tftp.c b/networking/tftp.c index b2c3c033c..0e5b48d40 100644 --- a/networking/tftp.c +++ b/networking/tftp.c | |||
@@ -90,7 +90,7 @@ struct globals { | |||
90 | const char *file; | 90 | const char *file; |
91 | bb_progress_t pmt; | 91 | bb_progress_t pmt; |
92 | #endif | 92 | #endif |
93 | }; | 93 | } FIX_ALIASING; |
94 | #define G (*(struct globals*)&bb_common_bufsiz1) | 94 | #define G (*(struct globals*)&bb_common_bufsiz1) |
95 | struct BUG_G_too_big { | 95 | struct BUG_G_too_big { |
96 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; | 96 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; |
diff --git a/networking/wget.c b/networking/wget.c index ad1770b58..9d813dcc2 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -30,7 +30,7 @@ struct globals { | |||
30 | #endif | 30 | #endif |
31 | smallint chunked; /* chunked transfer encoding */ | 31 | smallint chunked; /* chunked transfer encoding */ |
32 | smallint got_clen; /* got content-length: from server */ | 32 | smallint got_clen; /* got content-length: from server */ |
33 | }; | 33 | } FIX_ALIASING; |
34 | #define G (*(struct globals*)&bb_common_bufsiz1) | 34 | #define G (*(struct globals*)&bb_common_bufsiz1) |
35 | struct BUG_G_too_big { | 35 | struct BUG_G_too_big { |
36 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; | 36 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; |
diff --git a/networking/zcip.c b/networking/zcip.c index a4da5cbcd..db10d0a26 100644 --- a/networking/zcip.c +++ b/networking/zcip.c | |||
@@ -77,7 +77,7 @@ enum { | |||
77 | struct globals { | 77 | struct globals { |
78 | struct sockaddr saddr; | 78 | struct sockaddr saddr; |
79 | struct ether_addr eth_addr; | 79 | struct ether_addr eth_addr; |
80 | }; | 80 | } FIX_ALIASING; |
81 | #define G (*(struct globals*)&bb_common_bufsiz1) | 81 | #define G (*(struct globals*)&bb_common_bufsiz1) |
82 | #define saddr (G.saddr ) | 82 | #define saddr (G.saddr ) |
83 | #define eth_addr (G.eth_addr) | 83 | #define eth_addr (G.eth_addr) |