Even more dd(1) cleanups! Thanks to Bruce for staying on my case until

we're done (not yet!) :)

1 files changed, 13 insertions, 12 deletions

diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index 4e2419b..ae27a0e 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -40,22 +40,23 @@
 
 /* Input/output stream state. */
 typedef struct {
-	u_char	*db;			/* buffer address */
-	u_char	*dbp;			/* current buffer I/O address */
-	size_t	dbcnt;			/* current buffer byte count */
-	size_t	dbrcnt;			/* last read byte count */
-	size_t	dbsz;			/* buffer size */
+	u_char		*db;		/* buffer address */
+	u_char		*dbp;		/* current buffer I/O address */
+	/* XXX ssize_t? */
+	size_t		dbcnt;		/* current buffer byte count */
+	size_t		dbrcnt;		/* last read byte count */
+	size_t		dbsz;		/* buffer size */
 
 #define	ISCHR		0x01		/* character device (warn on short) */
-#define	ISPIPE		0x02		/* pipe (not truncatable) */
-#define	ISTAPE		0x04		/* tape (not seekable) */
+#define	ISPIPE		0x02		/* pipe-like (not truncatable) */
+#define	ISTAPE		0x04		/* tape */
 #define	ISSEEK		0x08		/* valid to seek on */
 #define	NOREAD		0x10		/* not readable */
-	u_int	flags;
+	u_int		flags;
 
-	char 	*name;			/* name */
-	int	fd;			/* file descriptor */
-	off_t	offset;			/* # of blocks to skip */
+	char 		*name;		/* name */
+	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 */
@@ -71,7 +72,7 @@ typedef struct {
 	u_quad_t	trunc;		/* # of truncated records */
 	u_quad_t	swab;		/* # of odd-length swab blocks */
 	u_quad_t	bytes;		/* # of bytes written */
-	double	start; 			/* start time of dd */
+	double		start; 			/* start time of dd */
 } STAT;
 
 /* Flags (in ddflags). */