[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 4/6] OptsVisitor: rebase opts_type_uint64() to parse_u
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [RFC 4/6] OptsVisitor: rebase opts_type_uint64() to parse_uint_full() |
Date: |
Thu, 18 Jul 2013 15:59:22 +0200 |
Simplify the code in preparation for the next patch.
Signed-off-by: Laszlo Ersek <address@hidden>
---
qapi/opts-visitor.c | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 287aa06..ce6c290 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -384,6 +384,7 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char
*name, Error **errp)
OptsVisitor *ov = DO_UPCAST(OptsVisitor, visitor, v);
const QemuOpt *opt;
const char *str;
+ unsigned long long val;
if (ov->list_mode == LM_UNSIGNED_INTERVAL) {
*obj = ov->range_next.u;
@@ -394,26 +395,12 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char
*name, Error **errp)
if (!opt) {
return;
}
-
str = opt->str;
- if (str != NULL) {
- while (isspace((unsigned char)*str)) {
- ++str;
- }
-
- if (*str != '-' && *str != '\0') {
- unsigned long long val;
- char *endptr;
- /* non-empty, non-negative subject sequence */
- errno = 0;
- val = strtoull(str, &endptr, 0);
- if (*endptr == '\0' && errno == 0 && val <= UINT64_MAX) {
- *obj = val;
- processed(ov, name);
- return;
- }
- }
+ if (parse_uint_full(str, &val, 0) == 0 && val <= UINT64_MAX) {
+ *obj = val;
+ processed(ov, name);
+ return;
}
error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
"an uint64 value");
--
1.7.1
[Qemu-devel] [RFC 4/6] OptsVisitor: rebase opts_type_uint64() to parse_uint_full(),
Laszlo Ersek <=
[Qemu-devel] [RFC 3/6] OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS, Laszlo Ersek, 2013/07/18
[Qemu-devel] [RFC 5/6] OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS, Laszlo Ersek, 2013/07/18
[Qemu-devel] [RFC 6/6] OptsVisitor: don't try to flatten overlong integer ranges, Laszlo Ersek, 2013/07/18