From: Karel Zak <kzak@redhat.com>
Date: Fri, 14 Sep 2018 13:49:00 +0000 (+0200)
Subject: lsblk: use lsblk_ prefix mountpoint getter
X-Git-Tag: v2.33-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04be258d65ba9fcc61db3f99ba09149f92d5c2c8;p=thirdparty%2Futil-linux.git

lsblk: use lsblk_ prefix mountpoint getter

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk-mnt.c b/misc-utils/lsblk-mnt.c
index 48f68dfc9f..6bc634043f 100644
--- a/misc-utils/lsblk-mnt.c
+++ b/misc-utils/lsblk-mnt.c
@@ -42,7 +42,7 @@ static int is_active_swap(const char *filename)
 	return mnt_table_find_srcpath(swaps, filename, MNT_ITER_BACKWARD) != NULL;
 }
 
-char *get_device_mountpoint(struct blkdev_cxt *cxt)
+char *lsblk_device_get_mountpoint(struct blkdev_cxt *cxt)
 {
 	struct libmnt_fs *fs;
 	const char *fsroot;
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 4a2e265eea..d466a25b18 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -785,7 +785,7 @@ static char *get_vfs_attribute(struct blkdev_cxt *cxt, int id)
 	char *mnt;
 
 	if (!cxt->fsstat.f_blocks) {
-		mnt = get_device_mountpoint(cxt);
+		mnt = lsblk_device_get_mountpoint(cxt);
 		if (!mnt)
 			return NULL;
 		if (statvfs(mnt, &cxt->fsstat) != 0)
@@ -894,7 +894,7 @@ static void set_scols_data(struct blkdev_cxt *cxt, int col, int id, struct libsc
 		str = get_vfs_attribute(cxt, id);
 		break;
 	case COL_TARGET:
-		str = xstrdup(get_device_mountpoint(cxt));
+		str = xstrdup(lsblk_device_get_mountpoint(cxt));
 		break;
 	case COL_LABEL:
 		probe_device(cxt);
diff --git a/misc-utils/lsblk.h b/misc-utils/lsblk.h
index abcf96f209..8817314afd 100644
--- a/misc-utils/lsblk.h
+++ b/misc-utils/lsblk.h
@@ -92,10 +92,10 @@ struct blkdev_cxt {
 	unsigned int	is_mounted : 1;
 };
 
-
+/* lsblk-mnt.c */
 extern void lsblk_mnt_init(void);
 extern void lsblk_mnt_deinit(void);
 
-extern char *get_device_mountpoint(struct blkdev_cxt *cxt);
+extern char *lsblk_device_get_mountpoint(struct blkdev_cxt *cxt);
 
 #endif /* UTIL_LINUX_LSBLK_H */