aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorKirk McKusick <mckusick@FreeBSD.org>2011-01-24 06:17:05 +0000
committerKirk McKusick <mckusick@FreeBSD.org>2011-01-24 06:17:05 +0000
commit7649cb0043cb41571f2748bc287da294a8c3b870 (patch)
tree745a3d9e1c16eed61f71f5c30e0dd0e1c250c1e8 /sbin
parent9c990fb2a4b18c1d8518ce5466757c5c2b89d8e8 (diff)
downloadsrc-7649cb0043cb41571f2748bc287da294a8c3b870.tar.gz
src-7649cb0043cb41571f2748bc287da294a8c3b870.zip
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
Notes
Notes: svn path=/head/; revision=217769
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dump/itime.c2
-rw-r--r--sbin/dump/main.c2
-rw-r--r--sbin/dump/optr.c2
-rw-r--r--sbin/dump/tape.c2
-rw-r--r--sbin/fsck_ffs/inode.c2
-rw-r--r--sbin/fsck_ffs/main.c4
-rw-r--r--sbin/fsck_ffs/suj.c5
-rw-r--r--sbin/fsdb/fsdb.c2
-rw-r--r--sbin/fsirand/fsirand.c4
-rw-r--r--sbin/newfs/mkfs.c19
10 files changed, 22 insertions, 22 deletions
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 4cac87b41a1b..f3271885fe13 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 e344887de145..3e6ed1f1ac52 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 7173fc9a3c47..311e2551affc 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 913409fb7b01..ff4e397849dd 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 5feead0ed5e8..fa738ed02fbe 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 e556240bc3d4..8ee140d53bf4 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 279e880eaee5..60e3b33a901b 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 5622cbb29196..172265368208 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 761ce5e40188..483879e45d33 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 96fa9eb8a91d..f98a51a7c313 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"
/*