From 7b7558d88436331476243b0b668d2e257d7687fe Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Fri, 22 Feb 2002 20:51:00 +0000
Subject: Fix warnings inspired by lint, a commercial lint and WARNS=4.

---
 bin/dd/args.c | 1 +
 bin/dd/dd.c   | 5 ++---
 bin/dd/dd.h   | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'bin/dd')

diff --git a/bin/dd/args.c b/bin/dd/args.c
index 8e6fab6..6a4607e 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -371,6 +371,7 @@ get_num(const char *val)
 	case 'w':
 		mult = sizeof(int);
 		break;
+	default:
 	}
 
 	if (mult != 0) {
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 52d4144..cdd358e 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -54,7 +54,6 @@ static const char rcsid[] =
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/filio.h>
-#include <sys/time.h>
 
 #include <ctype.h>
 #include <err.h>
@@ -78,8 +77,8 @@ IO	in, out;		/* input/output state */
 STAT	st;			/* statistics */
 void	(*cfunc)(void);		/* conversion function */
 u_quad_t cpy_cnt;		/* # of blocks to copy */
-off_t	pending = 0;		/* pending seek if sparse */
-u_int	ddflags;		/* conversion options */
+static off_t	pending = 0;	/* pending seek if sparse */
+u_int	ddflags = 0;		/* conversion options */
 size_t	cbsz;			/* conversion block size */
 quad_t	files_cnt = 1;		/* # of files to copy */
 const	u_char *ctab;		/* conversion table */
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index 183176b..caf161b 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -59,10 +59,6 @@ typedef struct {
 	int		fd;		/* file descriptor */
 	off_t		offset;		/* # of blocks to skip */
 
-	u_quad_t	f_stats;	/* # of full blocks processed */
-	u_quad_t	p_stats;	/* # of partial blocks processed */
-	u_quad_t	s_stats;	/* # of odd swab blocks */
-	u_quad_t	t_stats;	/* # of truncations */
 } IO;
 
 typedef struct {
-- 
cgit v1.1