summaryrefslogtreecommitdiffstats
path: root/include/qemu
diff options
context:
space:
mode:
authorMarkus Armbruster2017-02-21 21:14:06 +0100
committerMarkus Armbruster2017-02-23 20:35:36 +0100
commitf17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7 (patch)
tree65d92c1363f1c071214779eee670185ff31094e7 /include/qemu
parentutil/cutils: Let qemu_strtosz*() optionally reject trailing crap (diff)
downloadqemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.tar.gz
qemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.tar.xz
qemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.zip
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 'include/qemu')
-rw-r--r--include/qemu/cutils.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 3fdbb6b4c1..4c68d5c7c1 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -139,9 +139,9 @@ int parse_uint(const char *s, unsigned long long *value, char **endptr,
int base);
int parse_uint_full(const char *s, unsigned long long *value, int base);
-int64_t qemu_strtosz(const char *nptr, char **end);
-int64_t qemu_strtosz_MiB(const char *nptr, char **end);
-int64_t qemu_strtosz_metric(const char *nptr, char **end);
+int qemu_strtosz(const char *nptr, char **end, int64_t *result);
+int qemu_strtosz_MiB(const char *nptr, char **end, int64_t *result);
+int qemu_strtosz_metric(const char *nptr, char **end, int64_t *result);
#define K_BYTE (1ULL << 10)
#define M_BYTE (1ULL << 20)