Signed-off-by: Markus Armbruster <arm...@redhat.com> --- qapi/qobject-input-visitor.c | 87 ++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 52 deletions(-)
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 0bf6849..970bb37 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -143,6 +143,28 @@ static QObject *qobject_input_get_object(QObjectInputVisitor *qiv, return obj; } +static const char *qobject_input_get_autocast(QObjectInputVisitor *qiv, + const char *name, + Error **errp) +{ + QObject *qobj; + QString *qstr; + + qobj = qobject_input_get_object(qiv, name, true, errp); + if (!qobj) { + return NULL; + } + + qstr = qobject_to_qstring(qobj); + if (!qstr) { + error_setg(errp, QERR_INVALID_PARAMETER_TYPE, + qobject_input_get_name(qiv, name), "string"); + return NULL; + } + + return qstring_get_str(qstr); +} + static void qdict_add_key(const char *key, QObject *obj, void *opaque) { GHashTable *h = opaque; @@ -328,20 +350,13 @@ static void qobject_input_type_int64_autocast(Visitor *v, const char *name, int64_t *obj, Error **errp) { QObjectInputVisitor *qiv = to_qiv(v); - QObject *qobj = qobject_input_get_object(qiv, name, true, errp); - QString *qstr; + const char *str = qobject_input_get_autocast(qiv, name, errp); - if (!qobj) { - return; - } - qstr = qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } - if (qemu_strtoi64(qstring_get_str(qstr), NULL, 0, obj) < 0) { + if (qemu_strtoi64(str, NULL, 0, obj) < 0) { /* TODO report -ERANGE more nicely */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, qobject_input_get_name(qiv, name), "integer"); @@ -373,20 +388,13 @@ static void qobject_input_type_uint64_autocast(Visitor *v, const char *name, uint64_t *obj, Error **errp) { QObjectInputVisitor *qiv = to_qiv(v); - QObject *qobj = qobject_input_get_object(qiv, name, true, errp); - QString *qstr; + const char *str = qobject_input_get_autocast(qiv, name, errp); - if (!qobj) { - return; - } - qstr = qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } - if (qemu_strtou64(qstring_get_str(qstr), NULL, 0, obj) < 0) { + if (qemu_strtou64(str, NULL, 0, obj) < 0) { /* TODO report -ERANGE more nicely */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, qobject_input_get_name(qiv, name), "integer"); @@ -417,21 +425,12 @@ static void qobject_input_type_bool_autocast(Visitor *v, const char *name, bool *obj, Error **errp) { QObjectInputVisitor *qiv = to_qiv(v); - QObject *qobj = qobject_input_get_object(qiv, name, true, errp); - QString *qstr; - const char *str; + const char *str = qobject_input_get_autocast(qiv, name, errp); - if (!qobj) { - return; - } - qstr = qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } - str = qstring_get_str(qstr); if (!strcmp(str, "on")) { *obj = true; } else if (!strcmp(str, "off")) { @@ -494,22 +493,13 @@ static void qobject_input_type_number_autocast(Visitor *v, const char *name, double *obj, Error **errp) { QObjectInputVisitor *qiv = to_qiv(v); - QObject *qobj = qobject_input_get_object(qiv, name, true, errp); - QString *qstr; - const char *str; + const char *str = qobject_input_get_autocast(qiv, name, errp); char *endp; - if (!qobj) { - return; - } - qstr = qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } - str = qstring_get_str(qstr); errno = 0; *obj = strtod(str, &endp); if (errno || endp == str || *endp) { @@ -553,20 +543,13 @@ static void qobject_input_type_size_autocast(Visitor *v, const char *name, uint64_t *obj, Error **errp) { QObjectInputVisitor *qiv = to_qiv(v); - QObject *qobj = qobject_input_get_object(qiv, name, true, errp); - QString *qstr; + const char *str = qobject_input_get_autocast(qiv, name, errp); - if (!qobj) { - return; - } - qstr = qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } - if (qemu_strtosz(qstring_get_str(qstr), NULL, obj) < 0) { + if (qemu_strtosz(str, NULL, obj) < 0) { /* TODO report -ERANGE more nicely */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, qobject_input_get_name(qiv, name), "size"); -- 2.7.4