diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-13 17:17:34 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-13 17:17:34 +0200 |
| commit | 7b85ec30b5941f0b90c48a990f2f6840aca87bce (patch) | |
| tree | 3565032bf3f34eeea195258d9d4edc9f01480e6e /editors/sed.c | |
| parent | 4d0c1ea4784c9844f8468d97ca5c26d3c70f9921 (diff) | |
| download | busybox-7b85ec30b5941f0b90c48a990f2f6840aca87bce.tar.gz | |
*: more BUILD_BUG_ON conversions
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors/sed.c')
| -rw-r--r-- | editors/sed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/sed.c b/editors/sed.c index 7bbf820d8..a8c35388b 100644 --- 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) { |