diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
| commit | 315054f4737a39489e0a14f3a92bff61f1592832 (patch) | |
| tree | 62bf010653374ce09b6beb4dfa0414a91457233b /bin/df | |
| parent | 79e3d817585ca08a91e30ad14abe43e2ab70295f (diff) | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'bin/df')
| -rw-r--r-- | bin/df/df.c | 3 | ||||
| -rw-r--r-- | bin/df/ext2fs_df.c | 4 | ||||
| -rw-r--r-- | bin/df/ffs_df.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/bin/df/df.c b/bin/df/df.c index 7cfe89bf7f3..d4d928c5471 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: df.c,v 1.51 2014/05/20 21:11:16 krw Exp $ */ +/* $OpenBSD: df.c,v 1.52 2015/01/16 06:39:31 deraadt Exp $ */ /* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */ /* @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/stat.h> #include <sys/mount.h> diff --git a/bin/df/ext2fs_df.c b/bin/df/ext2fs_df.c index 86ed0ecf9cc..07e02832ca3 100644 --- a/bin/df/ext2fs_df.c +++ b/bin/df/ext2fs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_df.c,v 1.11 2004/09/14 22:46:04 deraadt Exp $ */ +/* $OpenBSD: ext2fs_df.c,v 1.12 2015/01/16 06:39:31 deraadt Exp $ */ /* * This file is substantially derived from src/sys/ufs/ext2fs/ext2fs_vfsops.c:e2fs_statfs(). @@ -38,7 +38,7 @@ * @(#)ffs_vfsops.c 8.14 (Berkeley) 11/28/94 */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/mount.h> #include <ufs/ext2fs/ext2fs.h> #include <ufs/ext2fs/ext2fs_dinode.h> diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c index 2a1a733832c..d1fa39d6c2f 100644 --- a/bin/df/ffs_df.c +++ b/bin/df/ffs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_df.c,v 1.14 2014/05/16 13:44:09 krw Exp $ */ +/* $OpenBSD: ffs_df.c,v 1.15 2015/01/16 06:39:31 deraadt Exp $ */ /* * Copyright (c) 1980, 1990, 1993, 1994 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/param.h> /* MAXFRAG */ #include <sys/mount.h> #include <ufs/ufs/dinode.h> #include <ufs/ffs/fs.h> |