From: Masatake YAMATO <yamato@redhat.com>
Date: Wed, 19 Jul 2023 21:06:27 +0000 (+0900)
Subject: lsfd: include common headers in lsfd.h
X-Git-Tag: v2.40-rc1~321^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1680455be287b1a6b5aa6a0157ad8eb057f7cf28;p=thirdparty%2Futil-linux.git

lsfd: include common headers in lsfd.h

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/misc-utils/lsfd-bdev.c b/misc-utils/lsfd-bdev.c
index 7be99dbde4..b61fdbbf4c 100644
--- a/misc-utils/lsfd-bdev.c
+++ b/misc-utils/lsfd-bdev.c
@@ -19,10 +19,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 
 static struct list_head partitions;
diff --git a/misc-utils/lsfd-cdev.c b/misc-utils/lsfd-cdev.c
index 5f0f306500..70751bab97 100644
--- a/misc-utils/lsfd-cdev.c
+++ b/misc-utils/lsfd-cdev.c
@@ -19,10 +19,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 
 static struct list_head miscdevs;
diff --git a/misc-utils/lsfd-fifo.c b/misc-utils/lsfd-fifo.c
index 6880d8dd47..b78e6d4875 100644
--- a/misc-utils/lsfd-fifo.c
+++ b/misc-utils/lsfd-fifo.c
@@ -19,10 +19,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 
 struct fifo {
diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c
index 004dd665e2..186ce62e5e 100644
--- a/misc-utils/lsfd-file.c
+++ b/misc-utils/lsfd-file.c
@@ -34,14 +34,11 @@
 #include <linux/sched.h>
 #include <sys/shm.h>
 
-#include "xalloc.h"
-#include "nls.h"
 #include "buffer.h"
 #include "idcache.h"
 #include "strutils.h"
 
 #include "procfs.h"
-#include "libsmartcols.h"
 
 #include "lsfd.h"
 
diff --git a/misc-utils/lsfd-sock-xinfo.c b/misc-utils/lsfd-sock-xinfo.c
index f4febc11db..12770ef967 100644
--- a/misc-utils/lsfd-sock-xinfo.c
+++ b/misc-utils/lsfd-sock-xinfo.c
@@ -34,9 +34,6 @@
 #include <string.h>
 #include <sys/socket.h>		/* SOCK_* */
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
 #include "sysfs.h"
 #include "bitops.h"
 
diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c
index 32645169c8..5ed133e652 100644
--- a/misc-utils/lsfd-sock.c
+++ b/misc-utils/lsfd-sock.c
@@ -22,10 +22,6 @@
 #include <sys/types.h>
 #include <sys/xattr.h>
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 #include "lsfd-sock.h"
 
diff --git a/misc-utils/lsfd-unkn.c b/misc-utils/lsfd-unkn.c
index 8a494122ca..acf29775db 100644
--- a/misc-utils/lsfd-unkn.c
+++ b/misc-utils/lsfd-unkn.c
@@ -22,10 +22,6 @@
 #include <sys/timerfd.h>
 #include <time.h>
 
-#include "xalloc.h"
-#include "nls.h"
-#include "libsmartcols.h"
-
 #include "signames.h"
 #include "timeutils.h"
 
diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index bc7f901d48..0174e27682 100644
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -46,8 +46,6 @@ static int kcmp(pid_t pid1, pid_t pid2, int type,
 #define PF_KTHREAD		0x00200000	/* I am a kernel thread */
 
 #include "c.h"
-#include "nls.h"
-#include "xalloc.h"
 #include "list.h"
 #include "closestream.h"
 #include "strutils.h"
@@ -56,8 +54,6 @@ static int kcmp(pid_t pid1, pid_t pid2, int type,
 #include "idcache.h"
 #include "pathnames.h"
 
-#include "libsmartcols.h"
-
 #include "lsfd.h"
 #include "lsfd-filter.h"
 #include "lsfd-counter.h"
diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index be4cc55d80..33467414dc 100644
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -29,9 +29,12 @@
 #include <dirent.h>
 #include <inttypes.h>
 
+#include "libsmartcols.h"
 #include "list.h"
+#include "nls.h"
 #include "path.h"
 #include "strutils.h"
+#include "xalloc.h"
 
 /*
  * column IDs