From 1ca20a77476fb69e2472080ef6ba23c8c0ad12ad Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 21 Mar 2001 07:34:27 +0000
Subject: A nice patch from Larry Doolittle that adds -Wshadow and cleans up
 most of the now-revealed problems.

---
 dd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dd.c')

diff --git a/dd.c b/dd.c
index 1618dd102..3f58929ba 100644
--- a/dd.c
+++ b/dd.c
@@ -45,7 +45,7 @@ static const struct suffix_mult dd_suffixes[] = {
 
 int dd_main(int argc, char **argv)
 {
-	int i, ifd, ofd, oflag, sync = FALSE, trunc = TRUE;
+	int i, ifd, ofd, oflag, sync_flag = FALSE, trunc = TRUE;
 	size_t in_full = 0, in_part = 0, out_full = 0, out_part = 0;
 	size_t bs = 512, count = -1;
 	ssize_t n;
@@ -73,7 +73,7 @@ int dd_main(int argc, char **argv)
 					trunc = FALSE;
 					buf += 7;
 				} else if (strncmp("sync", buf, 4) == 0) {
-					sync = TRUE;
+					sync_flag = TRUE;
 					buf += 4;
 				} else {
 					error_msg_and_die("invalid conversion `%s'", argv[i]+5);
@@ -138,7 +138,7 @@ int dd_main(int argc, char **argv)
 			in_full++;
 		else
 			in_part++;
-		if (sync) {
+		if (sync_flag) {
 			memset(buf + n, '\0', bs - n);
 			n = bs;
 		}
-- 
cgit v1.2.3