From c1bb7a2d60092a11ae98e10575dedb1ddc434872 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 22 Mar 2016 16:56:33 +0100 Subject: [PATCH] btrfs-progs: utils: make more arguments const Signed-off-by: David Sterba --- utils.c | 24 +++++++++++------------- utils.h | 20 +++++++++----------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/utils.c b/utils.c index 06efcab..e3e1502 100644 --- a/utils.c +++ b/utils.c @@ -856,8 +856,8 @@ out: return ret; } -int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret, - u64 max_block_count, int discard) +int btrfs_prepare_device(int fd, const char *file, int zero_end, + u64 *block_count_ret, u64 max_block_count, int discard) { u64 block_count; struct stat st; @@ -2350,9 +2350,7 @@ out: * 0 for nothing found * -1 for internal error */ -static int -check_overwrite( - char *device) +static int check_overwrite(const char *device) { const char *type; blkid_probe pr = NULL; @@ -2514,7 +2512,7 @@ int group_profile_max_safe_loss(u64 flags) * 1: something is wrong, an error is printed * 0: all is fine */ -int test_dev_for_mkfs(char *file, int force_overwrite) +int test_dev_for_mkfs(const char *file, int force_overwrite) { int ret, fd; struct stat st; @@ -2618,7 +2616,7 @@ int btrfs_scan_lblkid(void) return 0; } -int is_vol_small(char *file) +int is_vol_small(const char *file) { int fd = -1; int e; @@ -2652,7 +2650,7 @@ int is_vol_small(char *file) * first whitespace delimited token is a case insensitive match with yes * or y. */ -int ask_user(char *question) +int ask_user(const char *question) { char buf[30] = {0,}; char *saveptr = NULL; @@ -2866,7 +2864,7 @@ char* btrfs_group_profile_str(u64 flag) } } -u64 disk_size(char *path) +u64 disk_size(const char *path) { struct statfs sfs; @@ -2876,7 +2874,7 @@ u64 disk_size(char *path) return sfs.f_bsize * sfs.f_blocks; } -u64 get_partition_size(char *dev) +u64 get_partition_size(const char *dev) { u64 result; int fd = open(dev, O_RDONLY); @@ -3160,7 +3158,7 @@ int test_issubvolume(const char *path) return (int)stfs.f_type == BTRFS_SUPER_MAGIC; } -char *subvol_strip_mountpoint(char *mnt, char *full_path) +const char *subvol_strip_mountpoint(const char *mnt, const char *full_path) { int len = strlen(mnt); if (!len) @@ -3179,14 +3177,14 @@ char *subvol_strip_mountpoint(char *mnt, char *full_path) * 1: Error; and error info printed to the terminal. Fixme. * 2: If the fullpath is root tree instead of subvol tree */ -int get_subvol_info(char *fullpath, struct root_info *get_ri) +int get_subvol_info(const char *fullpath, struct root_info *get_ri) { u64 sv_id; int ret = 1; int fd = -1; int mntfd = -1; char *mnt = NULL; - char *svpath = NULL; + const char *svpath = NULL; DIR *dirstream1 = NULL; DIR *dirstream2 = NULL; diff --git a/utils.h b/utils.h index ae498a4..5eb462b 100644 --- a/utils.h +++ b/utils.h @@ -126,8 +126,8 @@ struct btrfs_mkfs_config { int make_btrfs(int fd, struct btrfs_mkfs_config *cfg); int btrfs_make_root_dir(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid); -int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret, - u64 max_block_count, int discard); +int btrfs_prepare_device(int fd, const char *file, int zero_end, + u64 *block_count_ret, u64 max_block_count, int discard); int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, struct btrfs_root *root, int fd, char *path, u64 block_count, u32 io_width, u32 io_align, @@ -169,16 +169,16 @@ int btrfs_open_dir(const char *path, DIR **dirstream, int verbose); u64 btrfs_device_size(int fd, struct stat *st); /* Helper to always get proper size of the destination string */ #define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest)) -int test_dev_for_mkfs(char *file, int force_overwrite); +int test_dev_for_mkfs(const char *file, int force_overwrite); int get_label_mounted(const char *mount_path, char *labelp); int get_label_unmounted(const char *dev, char *label); int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile, u64 dev_cnt, int mixed, int ssd); int group_profile_max_safe_loss(u64 flags); -int is_vol_small(char *file); +int is_vol_small(const char *file); int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, int verify); -int ask_user(char *question); +int ask_user(const char *question); int lookup_ino_rootid(int fd, u64 *rootid); int btrfs_scan_lblkid(void); int get_btrfs_mount(const char *dev, char *mp, size_t mp_size); @@ -186,20 +186,18 @@ int find_mount_root(const char *path, char **mount_root); int get_device_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args); int test_uuid_unique(char *fs_uuid); -u64 disk_size(char *path); +u64 disk_size(const char *path); int get_device_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args); -u64 get_partition_size(char *dev); -const char* group_type_str(u64 flags); -const char* group_profile_str(u64 flags); +u64 get_partition_size(const char *dev); int test_minimum_size(const char *file, u32 leafsize); int test_issubvolname(const char *name); int test_issubvolume(const char *path); int test_isdir(const char *path); -char *subvol_strip_mountpoint(char *mnt, char *full_path); -int get_subvol_info(char *fullpath, struct root_info *get_ri); +const char *subvol_strip_mountpoint(const char *mnt, const char *full_path); +int get_subvol_info(const char *fullpath, struct root_info *get_ri); /* * Btrfs minimum size calculation is complicated, it should include at least: -- 2.7.4