From: Karel Zak <kzak@redhat.com>
Date: Tue, 4 Jan 2011 21:36:09 +0000 (+0100)
Subject: remove duplicate includes
X-Git-Tag: v2.19-rc1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=218f9d3d6662800b2a85f2ade9824776d23137ae;p=thirdparty%2Futil-linux.git

remove duplicate includes

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/cpuset.c b/lib/cpuset.c
index 27b2349886..0c483fa5e3 100644
--- a/lib/cpuset.c
+++ b/lib/cpuset.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <sched.h>
 #include <errno.h>
 #include <string.h>
diff --git a/lib/strutils.c b/lib/strutils.c
index 9a59e67b66..94635b1e89 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -277,10 +277,6 @@ char *size_to_human_string(uint64_t bytes)
 
 #ifdef TEST_PROGRAM
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <err.h>
-
 int main(int argc, char *argv[])
 {
 	uintmax_t size = 0;
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 9d0f0160fb..af77c56991 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
diff --git a/mount/lomount.c b/mount/lomount.c
index 4d99d9f6f3..4d23a615ed 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -955,8 +955,6 @@ find_unused_loop_device (void) {
 #include <getopt.h>
 #include <stdarg.h>
 
-#include "strutils.h"
-
 static void
 usage(FILE *f) {
 	fprintf(f, _("\nUsage:\n"
diff --git a/shlibs/blkid/src/blkidP.h b/shlibs/blkid/src/blkidP.h
index 956a84e2f3..ab954e06cf 100644
--- a/shlibs/blkid/src/blkidP.h
+++ b/shlibs/blkid/src/blkidP.h
@@ -19,7 +19,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
index 0578c06550..3ed69e1b0f 100644
--- a/shlibs/mount/src/cache.c
+++ b/shlibs/mount/src/cache.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/shlibs/mount/src/optstr.c b/shlibs/mount/src/optstr.c
index 8894dfba68..8689dfb64e 100644
--- a/shlibs/mount/src/optstr.c
+++ b/shlibs/mount/src/optstr.c
@@ -27,8 +27,6 @@
 #include <selinux/context.h>
 #endif
 
-#include <ctype.h>
-
 #include "nls.h"
 #include "mountP.h"
 
diff --git a/shlibs/mount/src/tab_update.c b/shlibs/mount/src/tab_update.c
index cf32baf15d..fffdd20c47 100644
--- a/shlibs/mount/src/tab_update.c
+++ b/shlibs/mount/src/tab_update.c
@@ -817,8 +817,6 @@ int mnt_update_tab(mnt_update *upd, mnt_lock *lc)
 
 #ifdef TEST_PROGRAM
 
-#include <errno.h>
-
 mnt_lock *lock;
 
 static void lock_fallback(void)