summaryrefslogtreecommitdiffstats
path: root/sbin/fsck_ffs
diff options
context:
space:
mode:
authormckusick <mckusick@FreeBSD.org>2011-01-24 06:17:05 +0000
committermckusick <mckusick@FreeBSD.org>2011-01-24 06:17:05 +0000
commit242bd272d90e3db273117961eb0699de91f42249 (patch)
tree745a3d9e1c16eed61f71f5c30e0dd0e1c250c1e8 /sbin/fsck_ffs
parent3a6671bf9c39bc269e02df39ab55da355744bf4f (diff)
downloadFreeBSD-src-242bd272d90e3db273117961eb0699de91f42249.zip
FreeBSD-src-242bd272d90e3db273117961eb0699de91f42249.tar.gz
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
Diffstat (limited to 'sbin/fsck_ffs')
-rw-r--r--sbin/fsck_ffs/inode.c2
-rw-r--r--sbin/fsck_ffs/main.c4
-rw-r--r--sbin/fsck_ffs/suj.c5
3 files changed, 6 insertions, 5 deletions
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"
OpenPOWER on IntegriCloud