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-w32-7b85ec30b5941f0b90c48a990f2f6840aca87bce.tar.gz busybox-w32-7b85ec30b5941f0b90c48a990f2f6840aca87bce.tar.bz2 busybox-w32-7b85ec30b5941f0b90c48a990f2f6840aca87bce.zip |
*: 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 { | |||
162 | } pipeline; | 162 | } pipeline; |
163 | } FIX_ALIASING; | 163 | } FIX_ALIASING; |
164 | #define G (*(struct globals*)&bb_common_bufsiz1) | 164 | #define G (*(struct globals*)&bb_common_bufsiz1) |
165 | struct BUG_G_too_big { | ||
166 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; | ||
167 | }; | ||
168 | #define INIT_G() do { \ | 165 | #define INIT_G() do { \ |
166 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ | ||
169 | G.sed_cmd_tail = &G.sed_cmd_head; \ | 167 | G.sed_cmd_tail = &G.sed_cmd_head; \ |
170 | } while (0) | 168 | } while (0) |
171 | 169 | ||
@@ -501,9 +499,11 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr) | |||
501 | IDX_rbrace, | 499 | IDX_rbrace, |
502 | IDX_nul | 500 | IDX_nul |
503 | }; | 501 | }; |
504 | struct chk { char chk[sizeof(cmd_letters)-1 == IDX_nul ? 1 : -1]; }; | 502 | unsigned idx; |
503 | |||
504 | BUILD_BUG_ON(sizeof(cmd_letters)-1 != IDX_nul); | ||
505 | 505 | ||
506 | unsigned idx = strchrnul(cmd_letters, sed_cmd->cmd) - cmd_letters; | 506 | idx = strchrnul(cmd_letters, sed_cmd->cmd) - cmd_letters; |
507 | 507 | ||
508 | /* handle (s)ubstitution command */ | 508 | /* handle (s)ubstitution command */ |
509 | if (idx == IDX_s) { | 509 | if (idx == IDX_s) { |