On 2014/12/25 10:16, Gui Hecheng wrote: > The check_arg_type() function does quite generic thing, > move it to utils.c. > > Signed-off-by: Gui Hecheng <[email protected]>
Reviewed-by: Satoru Takeuchi <[email protected]> > --- > cmds-filesystem.c | 32 -------------------------------- > utils.c | 32 ++++++++++++++++++++++++++++++++ > utils.h | 1 + > 3 files changed, 33 insertions(+), 32 deletions(-) > > diff --git a/cmds-filesystem.c b/cmds-filesystem.c > index 253f105..4d7a797 100644 > --- a/cmds-filesystem.c > +++ b/cmds-filesystem.c > @@ -537,38 +537,6 @@ static int print_one_fs(struct btrfs_ioctl_fs_info_args > *fs_info, > return 0; > } > > -/* This function checks if the given input parameter is > - * an uuid or a path > - * return -1: some error in the given input > - * return 0: unknow input > - * return 1: given input is uuid > - * return 2: given input is path > - */ > -static int check_arg_type(char *input) > -{ > - uuid_t out; > - char path[PATH_MAX]; > - > - if (!input) > - return -EINVAL; > - > - if (realpath(input, path)) { > - if (is_block_device(path) == 1) > - return BTRFS_ARG_BLKDEV; > - > - if (is_mount_point(path) == 1) > - return BTRFS_ARG_MNTPOINT; > - > - return BTRFS_ARG_UNKNOWN; > - } > - > - if (strlen(input) == (BTRFS_UUID_UNPARSED_SIZE - 1) && > - !uuid_parse(input, out)) > - return BTRFS_ARG_UUID; > - > - return BTRFS_ARG_UNKNOWN; > -} > - > static int btrfs_scan_kernel(void *search) > { > int ret = 0, fd; > diff --git a/utils.c b/utils.c > index 2a92416..80f85e9 100644 > --- a/utils.c > +++ b/utils.c > @@ -852,6 +852,38 @@ int is_mount_point(const char *path) > return ret; > } > > +/* This function checks if the given input parameter is > + * an uuid or a path > + * return -1: some error in the given input > + * return 0: unknow input > + * return 1: given input is uuid > + * return 2: given input is path > + */ > +int check_arg_type(const char *input) > +{ > + uuid_t out; > + char path[PATH_MAX]; > + > + if (!input) > + return -EINVAL; > + > + if (realpath(input, path)) { > + if (is_block_device(path) == 1) > + return BTRFS_ARG_BLKDEV; > + > + if (is_mount_point(path) == 1) > + return BTRFS_ARG_MNTPOINT; > + > + return BTRFS_ARG_UNKNOWN; > + } > + > + if (strlen(input) == (BTRFS_UUID_UNPARSED_SIZE - 1) && > + !uuid_parse(input, out)) > + return BTRFS_ARG_UUID; > + > + return BTRFS_ARG_UNKNOWN; > +} > + > /* > * Find the mount point for a mounted device. > * On success, returns 0 with mountpoint in *mp. > diff --git a/utils.h b/utils.h > index 289e86b..8d67720 100644 > --- a/utils.h > +++ b/utils.h > @@ -115,6 +115,7 @@ int set_label(const char *btrfs_dev, const char *label); > char *__strncpy__null(char *dest, const char *src, size_t n); > int is_block_device(const char *file); > int is_mount_point(const char *file); > +int check_arg_type(const char *input); > int open_path_or_dev_mnt(const char *path, DIR **dirstream); > u64 btrfs_device_size(int fd, struct stat *st); > /* Helper to always get proper size of the destination string */ > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
