summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2016-10-16 19:53:12 +0000
committerMartin Natano <natano@cvs.openbsd.org>2016-10-16 19:53:12 +0000
commiteee049be7f597be67ef17a07e8e7a5a6e38bddbb (patch)
treed40c497b9e43e88517cea35218994cdda80a5238
parent8a198fd882212c4e276a06d4c5bf2f6725bff218 (diff)
Unused includes, as reported by include-what-you-use from ports.
-rw-r--r--usr.sbin/makefs/cd9660.c3
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_archimedes.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_debug.c4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c3
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_strings.c4
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_write.c2
-rw-r--r--usr.sbin/makefs/cd9660/iso9660_rrip.c1
-rw-r--r--usr.sbin/makefs/ffs.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c3
-rw-r--r--usr.sbin/makefs/ffs/ffs_balloc.c6
-rw-r--r--usr.sbin/makefs/makefs.c2
-rw-r--r--usr.sbin/makefs/msdos.c8
-rw-r--r--usr.sbin/makefs/walk.c3
13 files changed, 0 insertions, 42 deletions
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 313db045653..e4db7d5227e 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -95,13 +95,10 @@
*
*/
-#include <sys/param.h>
-#include <sys/mount.h>
#include <sys/queue.h>
#include <string.h>
#include <ctype.h>
-#include <util.h>
#include <inttypes.h>
#include "makefs.h"
diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.c b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
index 79f558c58e2..9b443aa1b86 100644
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.c
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <util.h>
#include "makefs.h"
#include "cd9660.h"
diff --git a/usr.sbin/makefs/cd9660/cd9660_debug.c b/usr.sbin/makefs/cd9660/cd9660_debug.c
index 64fef22a512..da21ab374d6 100644
--- a/usr.sbin/makefs/cd9660/cd9660_debug.c
+++ b/usr.sbin/makefs/cd9660/cd9660_debug.c
@@ -32,12 +32,8 @@
* OF SUCH DAMAGE.
*/
-#include <sys/param.h>
-#include <sys/mount.h>
-
#include <inttypes.h>
-#include "makefs.h"
#include "cd9660.h"
#include "iso9660_rrip.h"
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index e4f9b157dfd..9b4d143827e 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -36,7 +36,6 @@
#include "cd9660.h"
#include "cd9660_eltorito.h"
#include <sys/bootblock.h>
-#include <util.h>
#include <inttypes.h>
#ifdef DEBUG
@@ -45,8 +44,6 @@
#define ELTORITO_DPRINTF(__x)
#endif
-#include <util.h>
-
static struct boot_catalog_entry *cd9660_init_boot_catalog_entry(void);
static struct boot_catalog_entry *cd9660_boot_setup_validation_entry(char);
static struct boot_catalog_entry *cd9660_boot_setup_default_entry(
diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c
index a50f6e5c283..5738eb79497 100644
--- a/usr.sbin/makefs/cd9660/cd9660_strings.c
+++ b/usr.sbin/makefs/cd9660/cd9660_strings.c
@@ -32,13 +32,9 @@
* OF SUCH DAMAGE.
*/
-#include <sys/param.h>
-#include <sys/mount.h>
-
#include <ctype.h>
#include "makefs.h"
-#include "cd9660.h"
void
diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c
index 8489841976a..180817b254e 100644
--- a/usr.sbin/makefs/cd9660/cd9660_write.c
+++ b/usr.sbin/makefs/cd9660/cd9660_write.c
@@ -35,8 +35,6 @@
#include "cd9660.h"
#include "iso9660_rrip.h"
-#include <util.h>
-
static int cd9660_write_volume_descriptors(iso9660_disk *, FILE *);
static int cd9660_write_path_table(iso9660_disk *, FILE *, off_t, int);
static int cd9660_write_path_tables(iso9660_disk *, FILE *);
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c
index 15b4422c069..8551e9285bb 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.c
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c
@@ -40,7 +40,6 @@
#include "iso9660_rrip.h"
#include <sys/queue.h>
#include <stdio.h>
-#include <util.h>
static void cd9660_rrip_initialize_inode(cd9660node *);
static int cd9660_susp_handle_continuation(iso9660_disk *, cd9660node *);
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 96ef4ea2944..e4a2f6e5f2f 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -66,7 +66,6 @@
*/
#include <sys/param.h>
-#include <sys/mount.h>
#include <assert.h>
#include <errno.h>
@@ -77,7 +76,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <util.h>
#include "makefs.h"
#include "ffs.h"
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index dfd2784c9b2..31a4f1df063 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -42,12 +42,9 @@
*/
#include <sys/param.h>
-#include <sys/time.h>
#include <errno.h>
-#include "makefs.h"
-
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/ufs_bswap.h>
#include <ufs/ffs/fs.h>
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index 81ef75b8dea..03fabcd5452 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -32,16 +32,10 @@
* @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95
*/
-#include <sys/param.h>
-#include <sys/time.h>
-
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-
-#include "makefs.h"
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/ufs_bswap.h>
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 081bdfe39cc..ad4a8b75ce2 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -36,7 +36,6 @@
*/
#include <assert.h>
-#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
@@ -47,7 +46,6 @@
#include <util.h>
#include "makefs.h"
-#include "cd9660.h"
/*
* list of supported file systems and dispatch functions
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index a8c409e8bac..db061d4d3d8 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -30,23 +30,15 @@
*/
#include <sys/param.h>
-#include <sys/mount.h>
#include <assert.h>
-#include <errno.h>
#include <fcntl.h>
-#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <util.h>
#include <ffs/buf.h>
-#include <fs/msdosfs/bpb.h>
#include <fs/msdosfs/denode.h>
-#include <fs/msdosfs/msdosfsmount.h>
#include "makefs.h"
#include "msdos.h"
#include "mkfs_msdos.h"
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 7ac77530afc..effce40babe 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -39,14 +39,11 @@
#include <sys/stat.h>
#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
#include <stdio.h>
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <util.h>
#include "makefs.h"