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 /findutils | |
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 'findutils')
-rw-r--r-- | findutils/find.c | 4 | ||||
-rw-r--r-- | findutils/grep.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/findutils/find.c b/findutils/find.c index bd7ccc323..5bd753536 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -423,9 +423,7 @@ struct globals { | |||
423 | } FIX_ALIASING; | 423 | } FIX_ALIASING; |
424 | #define G (*(struct globals*)&bb_common_bufsiz1) | 424 | #define G (*(struct globals*)&bb_common_bufsiz1) |
425 | #define INIT_G() do { \ | 425 | #define INIT_G() do { \ |
426 | struct G_sizecheck { \ | 426 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ |
427 | char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ | ||
428 | }; \ | ||
429 | /* we have to zero it out because of NOEXEC */ \ | 427 | /* we have to zero it out because of NOEXEC */ \ |
430 | memset(&G, 0, sizeof(G)); \ | 428 | memset(&G, 0, sizeof(G)); \ |
431 | IF_FEATURE_FIND_MAXDEPTH(G.minmaxdepth[1] = INT_MAX;) \ | 429 | IF_FEATURE_FIND_MAXDEPTH(G.minmaxdepth[1] = INT_MAX;) \ |
diff --git a/findutils/grep.c b/findutils/grep.c index b9621384e..10b69275a 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -203,9 +203,7 @@ struct globals { | |||
203 | } FIX_ALIASING; | 203 | } FIX_ALIASING; |
204 | #define G (*(struct globals*)&bb_common_bufsiz1) | 204 | #define G (*(struct globals*)&bb_common_bufsiz1) |
205 | #define INIT_G() do { \ | 205 | #define INIT_G() do { \ |
206 | struct G_sizecheck { \ | 206 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ |
207 | char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ | ||
208 | }; \ | ||
209 | } while (0) | 207 | } while (0) |
210 | #define max_matches (G.max_matches ) | 208 | #define max_matches (G.max_matches ) |
211 | #if !ENABLE_EXTRA_COMPAT | 209 | #if !ENABLE_EXTRA_COMPAT |