diff options
| author | Mark Murray <markm@FreeBSD.org> | 2002-02-22 20:51:00 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 2002-02-22 20:51:00 +0000 |
| commit | 9afa09cd0eb32581d301f6b9f9dc252e2a879a05 (patch) | |
| tree | ba3cea9a04974b56b589e2a934d2f4ae56780dce /bin/dd | |
| parent | 71bea4f79d94bcf6f2423e80306d79ae46c5e0e2 (diff) | |
Notes
Diffstat (limited to 'bin/dd')
| -rw-r--r-- | bin/dd/args.c | 1 | ||||
| -rw-r--r-- | bin/dd/dd.c | 5 | ||||
| -rw-r--r-- | bin/dd/dd.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/bin/dd/args.c b/bin/dd/args.c index 8e6fab66f6a4..6a4607e199fb 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 52d41440d2f7..cdd358e7d288 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 183176b0e10c..caf161bade73 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 { |
