Commit 62d090e2 authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Luiz Capitulino
Browse files

OptsVisitor: rebase opts_type_uint64() to parse_uint_full() 



Simplify the code in preparation for the next patch.

Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Tested-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 1e1c555a

qapi/opts-visitor.c

+5 −18
Original line number Diff line number Diff line
@@ -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,27 +418,13 @@ 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) {

    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");

}