summaryrefslogtreecommitdiff
path: root/coreutils/dd.c
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-30 02:39:57 +0200
committerDenys Vlasenko2009-09-30 02:39:57 +0200
commit1b34d4f0b1d634eb8219d52c693fa80b99ed1bfa (patch)
tree1fa51b9580409d4fa8de86bf8c9b2ab083caf10d /coreutils/dd.c
parentc34c033c4256f88e759c5f7a59526b4397852a82 (diff)
downloadbusybox-1b34d4f0b1d634eb8219d52c693fa80b99ed1bfa.zip
busybox-1b34d4f0b1d634eb8219d52c693fa80b99ed1bfa.tar.gz
find: add zeroing of G.xxx; ftpd - remove extraneous zeroing of G.xxx
Brought "G trick" to the same shape in a few more places. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/dd.c')
-rw-r--r--coreutils/dd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 627e7e7..c5c9476 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -36,8 +36,10 @@ struct globals {
off_t out_full, out_part, in_full, in_part;
};
#define G (*(struct globals*)&bb_common_bufsiz1)
-/* We have to zero it out because of NOEXEC */
-#define INIT_G() memset(&G, 0, sizeof(G))
+#define INIT_G() do { \
+ /* we have to zero it out because of NOEXEC */ \
+ memset(&G, 0, sizeof(G)); \
+} while (0)
static void dd_output_status(int UNUSED_PARAM cur_signal)