This would help to reuse the function
Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
utils.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/utils.c b/utils.c
index f9545b8..b205005 100644
--- a/utils.c
+++ b/utils.c
@@ -1313,7 +1313,7 @@ static int get_label_unmounted(const char *dev)
* mounted path rather than device. Return the corresponding error
* the user specified the device path.
*/
-static int get_label_mounted(const char *mount_path)
+static int get_label_mounted(const char *mount_path, char *labelp)
{
char label[BTRFS_LABEL_SIZE];
int fd;
@@ -1331,16 +1331,24 @@ static int get_label_mounted(const char *mount_path)
return -1;
}
- fprintf(stdout, "%s\n", label);
+ strncpy(labelp, label, sizeof(label));
close(fd);
return 0;
}
int get_label(const char *btrfs_dev)
{
- return is_existing_blk_or_reg_file(btrfs_dev) ?
- get_label_unmounted(btrfs_dev) :
- get_label_mounted(btrfs_dev);
+ int ret;
+ char label[BTRFS_LABEL_SIZE];
+
+ if (is_existing_blk_or_reg_file(btrfs_dev))
+ ret = get_label_unmounted(btrfs_dev);
+ else {
+ ret = get_label_mounted(btrfs_dev, label);
+ if (!ret)
+ fprintf(stdout, "%s\n", label);
+ }
+ return ret;
}
int set_label(const char *btrfs_dev, const char *label)
--
1.8.1.227.g44fe835
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
