diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:14:00 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | 466dea14e677555dd24465aca75d00a3537ad062 (patch) | |
| tree | e1df0ed42f3bbac5bafe441aaad90b3d8ced3a3f /qemu-img.c | |
| parent | e591591b323772eea733de6027f5e8b50692d0ff (diff) | |
| download | focaccia-qemu-466dea14e677555dd24465aca75d00a3537ad062.tar.gz focaccia-qemu-466dea14e677555dd24465aca75d00a3537ad062.zip | |
util/cutils: New qemu_strtosz()
Most callers of qemu_strtosz_suffix() pass QEMU_STRTOSZ_DEFSUFFIX_B. Capture the pattern in new qemu_strtosz(). Inline qemu_strtosz_suffix() into its only remaining caller. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1487708048-2131-17-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/qemu-img.c b/qemu-img.c index cff22e3005..f1c641c0a1 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -462,8 +462,7 @@ static int img_create(int argc, char **argv) if (optind < argc) { int64_t sval; char *end; - sval = qemu_strtosz_suffix(argv[optind++], &end, - QEMU_STRTOSZ_DEFSUFFIX_B); + sval = qemu_strtosz(argv[optind++], &end); if (sval < 0 || *end) { if (sval == -ERANGE) { error_report("Image size must be less than 8 EiB!"); @@ -1865,7 +1864,7 @@ static int img_convert(int argc, char **argv) { int64_t sval; char *end; - sval = qemu_strtosz_suffix(optarg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + sval = qemu_strtosz(optarg, &end); if (sval < 0 || *end) { error_report("Invalid minimum zero buffer size for sparse output specified"); ret = -1; @@ -3653,8 +3652,7 @@ static int img_bench(int argc, char **argv) { char *end; errno = 0; - offset = qemu_strtosz_suffix(optarg, &end, - QEMU_STRTOSZ_DEFSUFFIX_B); + offset = qemu_strtosz(optarg, &end); if (offset < 0|| *end) { error_report("Invalid offset specified"); return 1; @@ -3670,7 +3668,7 @@ static int img_bench(int argc, char **argv) int64_t sval; char *end; - sval = qemu_strtosz_suffix(optarg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + sval = qemu_strtosz(optarg, &end); if (sval < 0 || sval > INT_MAX || *end) { error_report("Invalid buffer size specified"); return 1; @@ -3684,7 +3682,7 @@ static int img_bench(int argc, char **argv) int64_t sval; char *end; - sval = qemu_strtosz_suffix(optarg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + sval = qemu_strtosz(optarg, &end); if (sval < 0 || sval > INT_MAX || *end) { error_report("Invalid step size specified"); return 1; @@ -3847,7 +3845,7 @@ static int img_dd_bs(const char *arg, char *end; int64_t res; - res = qemu_strtosz_suffix(arg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + res = qemu_strtosz(arg, &end); if (res <= 0 || res > INT_MAX || *end) { error_report("invalid number: '%s'", arg); @@ -3864,7 +3862,7 @@ static int img_dd_count(const char *arg, { char *end; - dd->count = qemu_strtosz_suffix(arg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + dd->count = qemu_strtosz(arg, &end); if (dd->count < 0 || *end) { error_report("invalid number: '%s'", arg); @@ -3898,7 +3896,7 @@ static int img_dd_skip(const char *arg, { char *end; - in->offset = qemu_strtosz_suffix(arg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + in->offset = qemu_strtosz(arg, &end); if (in->offset < 0 || *end) { error_report("invalid number: '%s'", arg); |