Date: Mon, 24 Jan 2011 06:17:05 +0000 (UTC) From: Kirk McKusick <mckusick@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r217769 - in head: sbin/dump sbin/fsck_ffs sbin/fsdb sbin/fsirand sbin/newfs usr.sbin/makefs usr.sbin/quot Message-ID: <201101240617.p0O6H5tt080376@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mckusick Date: Mon Jan 24 06:17:05 2011 New Revision: 217769 URL: http://svn.freebsd.org/changeset/base/217769 Log: 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 Modified: head/sbin/dump/itime.c head/sbin/dump/main.c head/sbin/dump/optr.c head/sbin/dump/tape.c head/sbin/fsck_ffs/inode.c head/sbin/fsck_ffs/main.c head/sbin/fsck_ffs/suj.c head/sbin/fsdb/fsdb.c head/sbin/fsirand/fsirand.c head/sbin/newfs/mkfs.c head/usr.sbin/makefs/ffs.c head/usr.sbin/makefs/makefs.c head/usr.sbin/quot/quot.c Modified: head/sbin/dump/itime.c ============================================================================== --- head/sbin/dump/itime.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/dump/itime.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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" Modified: head/sbin/dump/main.c ============================================================================== --- head/sbin/dump/main.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/dump/main.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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> Modified: head/sbin/dump/optr.c ============================================================================== --- head/sbin/dump/optr.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/dump/optr.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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" Modified: head/sbin/dump/tape.c ============================================================================== --- head/sbin/dump/tape.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/dump/tape.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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" Modified: head/sbin/fsck_ffs/inode.c ============================================================================== --- head/sbin/fsck_ffs/inode.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/fsck_ffs/inode.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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" Modified: head/sbin/fsck_ffs/main.c ============================================================================== --- head/sbin/fsck_ffs/main.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/fsck_ffs/main.c Mon Jan 24 06:17:05 2011 (r217769) @@ -42,11 +42,10 @@ static char sccsid[] = "@(#)main.c 8.6 ( __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" Modified: head/sbin/fsck_ffs/suj.c ============================================================================== --- head/sbin/fsck_ffs/suj.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/fsck_ffs/suj.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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" Modified: head/sbin/fsdb/fsdb.c ============================================================================== --- head/sbin/fsdb/fsdb.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/fsdb/fsdb.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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> Modified: head/sbin/fsirand/fsirand.c ============================================================================== --- head/sbin/fsirand/fsirand.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/fsirand/fsirand.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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; Modified: head/sbin/newfs/mkfs.c ============================================================================== --- head/sbin/newfs/mkfs.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/sbin/newfs/mkfs.c Mon Jan 24 06:17:05 2011 (r217769) @@ -44,6 +44,14 @@ static char sccsid[] = "@(#)mkfs.c 8.11 #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" /* Modified: head/usr.sbin/makefs/ffs.c ============================================================================== --- head/usr.sbin/makefs/ffs.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/usr.sbin/makefs/ffs.c Mon Jan 24 06:17:05 2011 (r217769) @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include <unistd.h> #include "makefs.h" Modified: head/usr.sbin/makefs/makefs.c ============================================================================== --- head/usr.sbin/makefs/makefs.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/usr.sbin/makefs/makefs.c Mon Jan 24 06:17:05 2011 (r217769) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include <unistd.h> #include "makefs.h" Modified: head/usr.sbin/quot/quot.c ============================================================================== --- head/usr.sbin/quot/quot.c Mon Jan 24 06:03:58 2011 (r217768) +++ head/usr.sbin/quot/quot.c Mon Jan 24 06:17:05 2011 (r217769) @@ -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: */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101240617.p0O6H5tt080376>