diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:14:06 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7 (patch) | |
| tree | 65d92c1363f1c071214779eee670185ff31094e7 /qemu-img.c | |
| parent | 4fcdf65ae2c00ae69f7625f26ed41f37d77b403c (diff) | |
util/cutils: Return qemu_strtosz*() error and value separately
This makes qemu_strtosz(), qemu_strtosz_mebi() and
qemu_strtosz_metric() similar to qemu_strtoi64(), except negative
values are rejected.
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com> (maintainer:X86)
Cc: Kevin Wolf <kwolf@redhat.com> (supporter:Block layer core)
Cc: Max Reitz <mreitz@redhat.com> (supporter:Block layer core)
Cc: qemu-block@nongnu.org (open list:Block layer core)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1487708048-2131-23-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qemu-img.c b/qemu-img.c index 39ef581cc1..37d1afb839 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -370,10 +370,14 @@ static int add_old_style_options(const char *fmt, QemuOpts *opts, static int64_t cvtnum(const char *s) { - int64_t ret; + int err; + int64_t value; - ret = qemu_strtosz(s, NULL); - return ret; + err = qemu_strtosz(s, NULL, &value); + if (err < 0) { + return err; + } + return value; } static int img_create(int argc, char **argv) |