*: more BUILD_BUG_ON conversions

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 4 insertions, 9 deletions

diff --git a/networking/inetd.c b/networking/inetd.c
index dce5a0885..243165a07 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 a601430b6..70869d651 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 3bb6fb1ba..944cf1bd6 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)