Skip to contentSkip to conversation

multipath-tools: remove duplicate headers

PATCH In review Xose Vazquez Perez 2 participants 2 messages Jan 4, 2022 – Jan 6, 2022 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 multipath-tools: remove duplicate headers

Minimal clean up done with scripts/checkincludes.pl

Cc Martin Wilck <[email protected]>
Cc Benjamin Marzinski <[email protected]>
Cc Christophe Varoqui <[email protected]>
Cc DM-DEVEL ML <[email protected]>

---
./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(-)
libdmmp/libdmmp.c +0 -1
index 51f1d8fc..0025e66d 100644
@@ -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>
libmpathpersist/mpath_pr_ioctl.c +0 -1
index 17c52848..093ec71b 100644
@@ -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"
libmultipath/alias.c +0 -3
index 87c33afc..548a1184 100644
@@ -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"
 
libmultipath/checkers/directio.c +0 -1
index 28b0cf51..bc7b7be5 100644
@@ -12,7 +12,6 @@
 #include <sys/ioctl.h>
 #include <linux/fs.h>
 #include <errno.h>
-#include <unistd.h>
 #include <libaio.h>
 
 #include "checkers.h"
libmultipath/checkers/tur.c +0 -1
index a4b4a213..c93e4625 100644
@@ -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
libmultipath/print.c +0 -1
index c93fffd4..ef4e05d2 100644
@@ -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>
libmultipath/uevent.c +0 -1
index b1f00b3e..29e25572 100644
@@ -41,7 +41,6 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <libudev.h>
-#include <errno.h>
 
 #include "debug.h"
 #include "list.h"
multipath/main.c +0 -1
index 0a9377e5..d09f62db 100644
@@ -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().
multipathd/main.c +0 -2
index 4d611647..c241dad5 100644
@@ -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"
tests/strbuf.c +0 -1
index 43a477db..f8554da5 100644
@@ -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"
Signature · 6 lines
2.34.1

--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Xose Vazquez Perez

Minimal clean up done with scripts/checkincludes.pl

Cc Martin Wilck <[email protected]>
Cc Benjamin Marzinski <[email protected]>
Cc Christophe Varoqui <[email protected]>
Cc DM-DEVEL ML <[email protected]>

--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel