summary refs log tree commit diff stats
path: root/qobject/qjson.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-04-29 15:35:04 -0600
committerLuiz Capitulino <lcapitulino@redhat.com>2015-05-11 08:59:07 -0400
commita7c31816288a8f20fc387d69d441413e7a8c9ff1 (patch)
treec66deef69b36736bc7b77fa372c1efd54ba12881 /qobject/qjson.c
parent4cf2d837340589155acfda993c51e66eb5800416 (diff)
downloadfocaccia-qemu-a7c31816288a8f20fc387d69d441413e7a8c9ff1.tar.gz
focaccia-qemu-a7c31816288a8f20fc387d69d441413e7a8c9ff1.zip
qobject: Clean up around qtype_code
QTYPE_NONE is a sentinel value.  No QObject has this type code.
Document it properly.

Fix dump_qobject() to abort() on QTYPE_NONE, just like for any other
invalid type code.

Fix to_json() to abort() on all invalid type codes, not just
QTYPE_MAX.

Clean up Property member qtype's type: it's a qtype_code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'qobject/qjson.c')
-rw-r--r--qobject/qjson.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 12c576d548..f2857c13ea 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -260,9 +260,8 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)
     }
     case QTYPE_QERROR:
         /* XXX: should QError be emitted? */
-    case QTYPE_NONE:
         break;
-    case QTYPE_MAX:
+    default:
         abort();
     }
 }