[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] OptsVisitor: rebase opts_type_uint64() to pars
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 05/11] OptsVisitor: rebase opts_type_uint64() to parse_uint_full() |
Date: |
Tue, 20 Aug 2013 12:10:35 -0400 |
From: Laszlo Ersek <address@hidden>
Simplify the code in preparation for the next patch.
Signed-off-by: Laszlo Ersek <address@hidden>
Tested-by: Wanlong Gao <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qapi/opts-visitor.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 90be583..d8f9a0e 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -407,6 +407,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;
@@ -417,26 +418,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.8.1.4
- [Qemu-devel] [PULL 00/11] QMP queue, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 03/11] OptsVisitor: introduce list modes for interval flattening, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 02/11] OptsVisitor: introduce basic list modes, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 04/11] OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 05/11] OptsVisitor: rebase opts_type_uint64() to parse_uint_full(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 01/11] Convert stderr message calling error_get_pretty() to error_report(), Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 06/11] OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS, Luiz Capitulino, 2013/08/20
- [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Luiz Capitulino, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Andreas Färber, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Luiz Capitulino, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Andreas Färber, 2013/08/20
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Laszlo Ersek, 2013/08/21
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Eric Blake, 2013/08/21
- Re: [Qemu-devel] [PULL 08/11] add "test-int128" and "test-bitops" to .gitignore, Markus Armbruster, 2013/08/22
[Qemu-devel] [PULL 07/11] OptsVisitor: don't try to flatten overlong integer ranges, Luiz Capitulino, 2013/08/20