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 48f68dfc9f7eedc0260ce90df85ea8e6a7eadc98..6bc634043fa3bfd0e991a3c2652ee55f2d6e3945 100644 (file)
--- 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 4a2e265eea754442b1cdee72f104f2c7bb8fd7ba..d466a25b181dafa3ee8aec33deab9cd8b0ba30ec 100644 (file)
--- 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 abcf96f20939a3fe4580424fcc6c29dad875ff6f..8817314afd9da1378f90b0a2258809c3ed1b868e 100644 (file)
--- 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 */