From: Masatake YAMATO <yamato@redhat.com>
Date: Thu, 10 Nov 2022 21:02:00 +0000 (+0900)
Subject: lsfd: introduce is_mapped_file macro
X-Git-Tag: v2.39-rc1~406^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb3130759cdd8d94c76a539d28fce60bba58de6f;p=thirdparty%2Futil-linux.git

lsfd: introduce is_mapped_file macro

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

diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c
index 0c473fdded..ce310cc0f2 100644
--- a/misc-utils/lsfd-file.c
+++ b/misc-utils/lsfd-file.c
@@ -228,8 +228,7 @@ static bool file_fill_column(struct proc *proc,
 			xasprintf(&str, "%c%c%c",
 				  file->mode & S_IRUSR? 'r': '-',
 				  file->mode & S_IWUSR? 'w': '-',
-				  ((file->association == -ASSOC_SHM
-				   || file->association == -ASSOC_MEM)
+				  (is_mapped_file(file)
 				   && file->mode & S_IXUSR)? 'x': '-');
 		else
 			xasprintf(&str, "---");
@@ -254,8 +253,7 @@ static bool file_fill_column(struct proc *proc,
 		break;
 	}
 	case COL_MAPLEN:
-		if (file->association != -ASSOC_SHM
-		    && file->association != -ASSOC_MEM)
+		if (!is_mapped_file(file))
 			return true;
 		xasprintf(&str, "%ju", (uintmax_t)get_map_length(file));
 		break;
diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index d6329c6968..163715e58e 100644
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -149,6 +149,7 @@ struct file {
 };
 
 #define is_opened_file(_f) ((_f)->association >= 0)
+#define is_mapped_file(_f) (is_association((_f), SHM) || is_association((_f), MEM))
 #define is_association(_f, a)	((_f)->association < 0 && (_f)->association == -ASSOC_ ## a)
 
 struct file_class {