[dm-devel] [PATCH] multipath-tools: remove duplicate headers

[Xose Vazquez Perez]

Minimal clean up done with scripts/checkincludes.pl

Cc: Martin Wilck <mwilck at suse.com>
Cc: Benjamin Marzinski <bmarzins at redhat.com>
Cc: Christophe Varoqui <christophe.varoqui at opensvc.com>
Cc: DM-DEVEL ML <dm-devel at redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez at gmail.com>
---
./libdmmp/libdmmp.c: stdbool.h is included more than once.
./libmpathpersist/mpath_pr_ioctl.c: unistd.h is included more than once.
./libmultipath/alias.c: errno.h is included more than once.
./libmultipath/alias.c: stdlib.h is included more than once.
./libmultipath/alias.c: util.h is included more than once.
./libmultipath/checkers/directio.c: unistd.h is included more than once.
./libmultipath/checkers/tur.c: ../libmultipath/util.h is included more than once.
./libmultipath/print.c: string.h is included more than once.
./libmultipath/uevent.c: errno.h is included more than once.
./multipath/main.c: alias.h is included more than once.
./multipathd/main.c: uevent.h is included more than once.
./multipathd/main.c: wwids.h is included more than once.
./tests/strbuf.c: stdbool.h is included more than once.
---
 libdmmp/libdmmp.c                | 1 -
 libmpathpersist/mpath_pr_ioctl.c | 1 -
 libmultipath/alias.c             | 3 ---
 libmultipath/checkers/directio.c | 1 -
 libmultipath/checkers/tur.c      | 1 -
 libmultipath/print.c             | 1 -
 libmultipath/uevent.c            | 1 -
 multipath/main.c                 | 1 -
 multipathd/main.c                | 2 --
 tests/strbuf.c                   | 1 -
 10 files changed, 13 deletions(-)

diff --git a/libdmmp/libdmmp.c b/libdmmp/libdmmp.c
index 51f1d8fc..0025e66d 100644
--- a/libdmmp/libdmmp.c
+++ b/libdmmp/libdmmp.c
@@ -26,7 +26,6 @@
 #include <libudev.h>
 #include <errno.h>
 #include <libdevmapper.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <assert.h>
 #include <json.h>
diff --git a/libmpathpersist/mpath_pr_ioctl.c b/libmpathpersist/mpath_pr_ioctl.c
index 17c52848..093ec71b 100644
--- a/libmpathpersist/mpath_pr_ioctl.c
+++ b/libmpathpersist/mpath_pr_ioctl.c
@@ -10,7 +10,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 #include <libudev.h>
 #include "mpath_pr_ioctl.h"
 #include "mpath_persist.h"
diff --git a/libmultipath/alias.c b/libmultipath/alias.c
index 87c33afc..548a1184 100644
--- a/libmultipath/alias.c
+++ b/libmultipath/alias.c
@@ -4,7 +4,6 @@
  */
 #include <stdlib.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <limits.h>
@@ -19,8 +18,6 @@
 #include "checkers.h"
 #include "structs.h"
 #include "config.h"
-#include "util.h"
-#include "errno.h"
 #include "devmapper.h"
 #include "strbuf.h"
 
diff --git a/libmultipath/checkers/directio.c b/libmultipath/checkers/directio.c
index 28b0cf51..bc7b7be5 100644
--- a/libmultipath/checkers/directio.c
+++ b/libmultipath/checkers/directio.c
@@ -12,7 +12,6 @@
 #include <sys/ioctl.h>
 #include <linux/fs.h>
 #include <errno.h>
-#include <unistd.h>
 #include <libaio.h>
 
 #include "checkers.h"
diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
index a4b4a213..c93e4625 100644
--- a/libmultipath/checkers/tur.c
+++ b/libmultipath/checkers/tur.c
@@ -23,7 +23,6 @@
 #include "../libmultipath/sg_include.h"
 #include "../libmultipath/util.h"
 #include "../libmultipath/time-util.h"
-#include "../libmultipath/util.h"
 
 #define TUR_CMD_LEN 6
 #define HEAVY_CHECK_COUNT       10
diff --git a/libmultipath/print.c b/libmultipath/print.c
index c93fffd4..ef4e05d2 100644
--- a/libmultipath/print.c
+++ b/libmultipath/print.c
@@ -8,7 +8,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
 #include <assert.h>
 #include <libudev.h>
diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c
index b1f00b3e..29e25572 100644
--- a/libmultipath/uevent.c
+++ b/libmultipath/uevent.c
@@ -41,7 +41,6 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <libudev.h>
-#include <errno.h>
 
 #include "debug.h"
 #include "list.h"
diff --git a/multipath/main.c b/multipath/main.c
index 0a9377e5..d09f62db 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -63,7 +63,6 @@
 #include "time-util.h"
 #include "file.h"
 #include "valid.h"
-#include "alias.h"
 
 /*
  * Return values of configure(), check_path_valid(), and main().
diff --git a/multipathd/main.c b/multipathd/main.c
index 4d611647..c241dad5 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -59,7 +59,6 @@
 #include "prio.h"
 #include "wwids.h"
 #include "pgpolicies.h"
-#include "uevent.h"
 #include "log.h"
 #include "uxsock.h"
 #include "alias.h"
@@ -80,7 +79,6 @@
 #include "waiter.h"
 #include "dmevents.h"
 #include "io_err_stat.h"
-#include "wwids.h"
 #include "foreign.h"
 #include "../third-party/valgrind/drd.h"
 #include "init_unwinder.h"
diff --git a/tests/strbuf.c b/tests/strbuf.c
index 43a477db..f8554da5 100644
--- a/tests/strbuf.c
+++ b/tests/strbuf.c
@@ -9,7 +9,6 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <cmocka.h>
 #include <errno.h>
 #include "strbuf.h"
-- 
2.34.1