From 89ad5e9dba02540c40a092313bfe0d1e195d59cd Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 2 Jul 2019 00:03:32 +0200 Subject: [PATCH] btrfs-progs: path-utils: rename is_reg_file Add path_ prefix and update callers. Signed-off-by: David Sterba --- common/path-utils.c | 2 +- common/path-utils.h | 2 +- common/utils.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/path-utils.c b/common/path-utils.c index 62492610..6a0c317e 100644 --- a/common/path-utils.c +++ b/common/path-utils.c @@ -72,7 +72,7 @@ int is_mount_point(const char *path) return ret; } -int is_reg_file(const char *path) +int path_is_reg_file(const char *path) { struct stat statbuf; diff --git a/common/path-utils.h b/common/path-utils.h index 39c32ca4..37b76f84 100644 --- a/common/path-utils.h +++ b/common/path-utils.h @@ -31,7 +31,7 @@ char *__strncpy_null(char *dest, const char *src, size_t n); int path_is_block_device(const char *file); int is_mount_point(const char *file); int is_path_exist(const char *file); -int is_reg_file(const char *path); +int path_is_reg_file(const char *path); int is_same_loop_file(const char *a, const char *b); int is_existing_blk_or_reg_file(const char *filename); diff --git a/common/utils.c b/common/utils.c index f6d53ee4..b871ac59 100644 --- a/common/utils.c +++ b/common/utils.c @@ -437,7 +437,7 @@ int check_arg_type(const char *input) if (is_mount_point(path) == 1) return BTRFS_ARG_MNTPOINT; - if (is_reg_file(path)) + if (path_is_reg_file(path)) return BTRFS_ARG_REG; return BTRFS_ARG_UNKNOWN;