*: more BUILD_BUG_ON conversions

[oweals/busybox.git] / editors / sed.c

diff --git a/editors/sed.c b/editors/sed.c
index 7bbf820d8571627ef127d771cb4e67aac4938580..a8c35388b0fcbd0d1342e37a661f3c2fc19fddb3 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -162,10 +162,8 @@ struct globals {
        } pipeline;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-struct BUG_G_too_big {
-       char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
 #define INIT_G() do { \
+       BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        G.sed_cmd_tail = &G.sed_cmd_head; \
 } while (0)
 
@@ -501,9 +499,11 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                IDX_rbrace,
                IDX_nul
        };
-       struct chk { char chk[sizeof(cmd_letters)-1 == IDX_nul ? 1 : -1]; };
+       unsigned idx;
+
+       BUILD_BUG_ON(sizeof(cmd_letters)-1 != IDX_nul);
 
-       unsigned idx = strchrnul(cmd_letters, sed_cmd->cmd) - cmd_letters;
+       idx = strchrnul(cmd_letters, sed_cmd->cmd) - cmd_letters;
 
        /* handle (s)ubstitution command */
        if (idx == IDX_s) {