Signed-off-by: Wang Shilong <wangsl.f...@cn.fujitsu.com> --- btrfs-find-root.c | 23 +++-------------------- btrfs-list.c | 14 +++----------- cmds-restore.c | 20 ++++---------------- utils.c | 2 +- 4 files changed, 11 insertions(+), 48 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 0ba4c57..045eab6 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -289,30 +289,13 @@ int main(int argc, char **argv) switch(opt) { errno = 0; case 'o': - search_objectid = (u64)strtoll(optarg, NULL, - 10); - if (errno) { - fprintf(stderr, "Error parsing " - "objectid\n"); - exit(1); - } + search_objectid = btrfs_strtoull(optarg, 10); break; case 'g': - search_generation = (u64)strtoll(optarg, NULL, - 10); - if (errno) { - fprintf(stderr, "Error parsing " - "generation\n"); - exit(1); - } + search_generation = btrfs_strtoull(optarg, 10); break; case 'l': - search_level = strtol(optarg, NULL, 10); - if (errno) { - fprintf(stderr, "Error parsing " - "level\n"); - exit(1); - } + search_level = btrfs_strtoull(optarg, 10); break; default: usage(); diff --git a/btrfs-list.c b/btrfs-list.c index 9effb27..1c457ae 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -1854,32 +1854,24 @@ int btrfs_list_parse_filter_string(char *opt_arg, { u64 arg; - char *ptr_parse_end = NULL; - char *ptr_opt_arg_end = opt_arg + strlen(opt_arg); switch (*(opt_arg++)) { case '+': - arg = (u64)strtol(opt_arg, &ptr_parse_end, 10); + arg = btrfs_strtoull(opt_arg, 10); type += 2; - if (ptr_parse_end != ptr_opt_arg_end) - return -1; btrfs_list_setup_filter(filters, type, arg); break; case '-': - arg = (u64)strtoll(opt_arg, &ptr_parse_end, 10); + arg = btrfs_strtoull(opt_arg, 10); type += 1; - if (ptr_parse_end != ptr_opt_arg_end) - return -1; btrfs_list_setup_filter(filters, type, arg); break; default: opt_arg--; - arg = (u64)strtoll(opt_arg, &ptr_parse_end, 10); + arg = btrfs_strtoull(opt_arg, 10); - if (ptr_parse_end != ptr_opt_arg_end) - return -1; btrfs_list_setup_filter(filters, type, arg); break; } diff --git a/cmds-restore.c b/cmds-restore.c index fd533ce..233d538 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -1161,23 +1161,15 @@ int cmd_restore(int argc, char **argv) break; case 't': errno = 0; - tree_location = (u64)strtoll(optarg, NULL, 10); - if (errno != 0) { - fprintf(stderr, "Tree location not valid\n"); - exit(1); - } + tree_location = btrfs_strtoull(optarg, 10); break; case 'f': errno = 0; - fs_location = (u64)strtoll(optarg, NULL, 10); - if (errno != 0) { - fprintf(stderr, "Fs location not valid\n"); - exit(1); - } + fs_location = btrfs_strtoull(optarg, 10); break; case 'u': errno = 0; - super_mirror = (int)strtol(optarg, NULL, 10); + super_mirror = btrfs_strtoull(optarg, 10); if (errno != 0 || super_mirror >= BTRFS_SUPER_MIRROR_MAX) { fprintf(stderr, "Super mirror not " @@ -1190,11 +1182,7 @@ int cmd_restore(int argc, char **argv) break; case 'r': errno = 0; - root_objectid = (u64)strtoll(optarg, NULL, 10); - if (errno != 0) { - fprintf(stderr, "Root objectid not valid\n"); - exit(1); - } + root_objectid = btrfs_strtoull(optarg, 10); break; case 'l': list_roots = 1; diff --git a/utils.c b/utils.c index 0698d8d..ea73984 100644 --- a/utils.c +++ b/utils.c @@ -1586,7 +1586,7 @@ u64 parse_size(char *s) s[i+1]); exit(51); } - return strtoull(s, NULL, 10) * mult; + return btrfs_strtoull(s, 10) * mult; } int open_file_or_dir(const char *fname, DIR **dirstream) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html