commit 58634047b7deeab36e4b07c4744e44d698975561
author Marc-André Lureau <marcandre.lureau@redhat.com> Wed Jun 07 20:35:57 2017 +0400
committer Markus Armbruster <armbru@redhat.com> Mon Jun 19 14:56:29 2017 +0200
tree 1a8f91542326a283ca50bb4ecaeebd2d38d097f2
parent c1214ad3dcf392ca3d9354c8a811c76f0d4c45ce

qapi: Clean up qobject_input_type_number() control flow

Use the more common pattern to error out.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170607163635.17635-6-marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>

qapi/qobject-input-visitor.c

diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index eac40f6..26ef49a 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -547,13 +547,13 @@
     }
 
     qfloat = qobject_to_qfloat(qobj);
-    if (qfloat) {
-        *obj = qfloat_get_double(qobject_to_qfloat(qobj));
+    if (!qfloat) {
+        error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
+                   full_name(qiv, name), "number");
         return;
     }
 
-    error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
-               full_name(qiv, name), "number");
+    *obj = qfloat_get_double(qobject_to_qfloat(qobj));
 }
 
 static void qobject_input_type_number_keyval(Visitor *v, const char *name,