The dump, fsck_ffs, fsdb, fsirand, newfs, makefs, and quot utilities

include sys/time.h instead of time.h. This include is incorrect as
per the manpages for the APIs and the POSIX definitions. This commit
replaces sys/time.h where necessary with time.h.

The commit also includes some minor style(9) header fixup in newfs.

This commit is part of a larger effort by Garrett Cooper started in
//depot/user/gcooper/posix-conformance-work/ -- to make FreeBSD more
POSIX compliant.

Submitted by:  Garrett Cooper   yanegomi at gmail dot com

13 files changed, 25 insertions, 23 deletions

diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 4cac87b..f327188 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -37,7 +37,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
 
@@ -49,6 +48,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <timeconv.h>
 
 #include "dump.h"
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index e344887..3e6ed1f 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -43,7 +43,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/disklabel.h>
 
@@ -64,6 +63,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <timeconv.h>
 #include <unistd.h>
 
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 7173fc9..311e255 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -38,7 +38,6 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
 
@@ -51,6 +50,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <stdarg.h>
 #include <signal.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "dump.h"
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 913409f..ff4e397 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -37,7 +37,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
@@ -54,6 +53,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "dump.h"
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 5feead0..fa738ed 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
-#include <sys/time.h>
 #include <sys/sysctl.h>
 
 #include <ufs/ufs/dinode.h>
@@ -47,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <pwd.h>
 #include <string.h>
+#include <time.h>
 
 #include "fsck.h"
 
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index e556240..8ee140d 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -42,11 +42,10 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/stat.h>
 #include <sys/file.h>
-#include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <sys/disklabel.h>
@@ -62,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <paths.h>
 #include <stdint.h>
 #include <string.h>
+#include <time.h>
 
 #include "fsck.h"
 
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index 279e880..60e3b33 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 
+#include <assert.h>
+#include <err.h>
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -46,8 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <strings.h>
 #include <sysexits.h>
-#include <err.h>
-#include <assert.h>
+#include <time.h>
 
 #include "fsck.h"
 
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 5622cbb..1722653 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -34,13 +34,13 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <grp.h>
 #include <histedit.h>
 #include <pwd.h>
 #include <string.h>
+#include <time.h>
 #include <timeconv.h>
 
 #include <ufs/ufs/dinode.h>
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 761ce5e..483879e 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -35,9 +35,8 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <sys/disklabel.h>
 #include <sys/param.h>
-#include <sys/time.h>
+#include <sys/disklabel.h>
 #include <sys/resource.h>
 
 #include <ufs/ufs/dinode.h>
@@ -50,6 +49,7 @@ static const char rcsid[] =
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 static void usage(void) __dead2;
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 96fa9eb..f98a51a 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -44,6 +44,14 @@ static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/param.h>
+#include <sys/disklabel.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <err.h>
 #include <grp.h>
 #include <limits.h>
@@ -52,20 +60,11 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <time.h>
 #include <unistd.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
-#include <sys/disklabel.h>
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
 #include "newfs.h"
 
 /*
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 4f3fded..a3c9d68 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "makefs.h"
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index f2420b6..60b6916 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "makefs.h"
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 4da58ba..979eef4 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stdint.h>
 #include <sys/mount.h>
 #include <sys/disklabel.h>
-#include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 
@@ -49,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 /* some flags of what to do: */