diff options
| author | Denys Vlasenko | 2015-10-13 17:17:34 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2015-10-13 17:17:34 +0200 |
| commit | 7b85ec30b5941f0b90c48a990f2f6840aca87bce (patch) | |
| tree | 3565032bf3f34eeea195258d9d4edc9f01480e6e /networking | |
| parent | 4d0c1ea4784c9844f8468d97ca5c26d3c70f9921 (diff) | |
| download | busybox-7b85ec30b5941f0b90c48a990f2f6840aca87bce.zip busybox-7b85ec30b5941f0b90c48a990f2f6840aca87bce.tar.gz | |
*: more BUILD_BUG_ON conversions
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/inetd.c | 4 | ||||
| -rw-r--r-- | networking/nbd-client.c | 5 | ||||
| -rw-r--r-- | networking/telnet.c | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/networking/inetd.c b/networking/inetd.c index dce5a08..243165a 100644 --- a/networking/inetd.c +++ b/networking/inetd.c @@ -329,9 +329,6 @@ struct globals { } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) }; -struct BUG_G_too_big { - char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; -}; #define rlim_ofile_cur (G.rlim_ofile_cur ) #define rlim_ofile (G.rlim_ofile ) #define serv_list (G.serv_list ) @@ -352,6 +349,7 @@ struct BUG_G_too_big { #define allsock (G.allsock ) #define line (G.line ) #define INIT_G() do { \ + BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ rlim_ofile_cur = OPEN_MAX; \ global_queuelen = 128; \ config_filename = "/etc/inetd.conf"; \ diff --git a/networking/nbd-client.c b/networking/nbd-client.c index a601430..70869d6 100644 --- a/networking/nbd-client.c +++ b/networking/nbd-client.c @@ -57,9 +57,8 @@ int nbdclient_main(int argc, char **argv) uint32_t flags; char data[124]; } nbd_header; - struct bug_check { - char c[offsetof(struct nbd_header_t, data) == 8+8+8+4 ? 1 : -1]; - }; + + BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4); // Parse command line stuff (just a stub now) if (argc != 4) diff --git a/networking/telnet.c b/networking/telnet.c index 3bb6fb1..944cf1b 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -110,9 +110,7 @@ struct globals { } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) #define INIT_G() do { \ - struct G_sizecheck { \ - char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ - }; \ + BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ } while (0) |