From: Masatake YAMATO <yamato@redhat.com>
Date: Sun, 12 Nov 2023 15:25:51 +0000 (+0900)
Subject: lslocks: rename functions for future extension
X-Git-Tag: v2.40-rc1~163^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b26824c73fe33f6b6e785bc89dc84c3ebb1f1d1;p=thirdparty%2Futil-linux.git

lslocks: rename functions for future extension

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

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 496f090e1c..38cc9d9d1a 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -239,7 +239,7 @@ static ino_t get_dev_inode(char *str, dev_t *dev)
 	return inum;
 }
 
-static struct lock *get_local_lock(char *buf)
+static struct lock *get_lock(char *buf)
 {
 	int i;
 	char *tok = NULL;
@@ -326,7 +326,7 @@ static struct lock *get_local_lock(char *buf)
 	return l;
 }
 
-static int get_local_locks(struct list_head *locks)
+static int get_proc_locks(struct list_head *locks)
 {
 	FILE *fp;
 	char buf[PATH_MAX];
@@ -335,7 +335,7 @@ static int get_local_locks(struct list_head *locks)
 		return -1;
 
 	while (fgets(buf, sizeof(buf), fp)) {
-		struct lock *l = get_local_lock(buf);
+		struct lock *l = get_lock(buf);
 		if (l)
 			list_add(&l->locks, locks);
 	}
@@ -582,7 +582,7 @@ static void __attribute__((__noreturn__)) usage(void)
 int main(int argc, char *argv[])
 {
 	int c, rc = 0;
-	struct list_head locks;
+	struct list_head proc_locks;
 	char *outarg = NULL;
 	enum {
 		OPT_OUTPUT_ALL = CHAR_MAX + 1
@@ -658,7 +658,7 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	INIT_LIST_HEAD(&locks);
+	INIT_LIST_HEAD(&proc_locks);
 
 	if (!ncolumns) {
 		/* default columns */
@@ -679,10 +679,10 @@ int main(int argc, char *argv[])
 
 	scols_init_debug(0);
 
-	rc = get_local_locks(&locks);
+	rc = get_proc_locks(&proc_locks);
 
-	if (!rc && !list_empty(&locks))
-		rc = show_locks(&locks, target_pid);
+	if (!rc && !list_empty(&proc_locks))
+		rc = show_locks(&proc_locks, target_pid);
 
 	mnt_unref_table(tab);
 	return rc;