diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-08-23 18:40:18 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-08-24 20:26:37 +0200 |
| commit | abe7c2067c21a89c6fd4cf2d8ba2fa37160d1d55 (patch) | |
| tree | 9b47fe3f0c5dc56c37c6ba9ef7072ea6d7276706 /include/qapi/qmp | |
| parent | a2731e08ee8633fcdc2af944b8f8f315678f7669 (diff) | |
| download | qemu-abe7c2067c21a89c6fd4cf2d8ba2fa37160d1d55.zip qemu-abe7c2067c21a89c6fd4cf2d8ba2fa37160d1d55.tar.gz qemu-abe7c2067c21a89c6fd4cf2d8ba2fa37160d1d55.tar.bz2 | |
json: Make JSONToken opaque outside json-parser.c
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-52-armbru@redhat.com>
Diffstat (limited to 'include/qapi/qmp')
| -rw-r--r-- | include/qapi/qmp/json-parser.h | 4 | ||||
| -rw-r--r-- | include/qapi/qmp/json-streamer.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/qapi/qmp/json-parser.h b/include/qapi/qmp/json-parser.h index a34209d..21b23d7 100644 --- a/include/qapi/qmp/json-parser.h +++ b/include/qapi/qmp/json-parser.h @@ -15,7 +15,11 @@ #define QEMU_JSON_PARSER_H #include "qemu-common.h" +#include "qapi/qmp/json-lexer.h" +typedef struct JSONToken JSONToken; + +JSONToken *json_token(JSONTokenType type, int x, int y, GString *tokstr); QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp); #endif diff --git a/include/qapi/qmp/json-streamer.h b/include/qapi/qmp/json-streamer.h index d1d7fe2..29950ac 100644 --- a/include/qapi/qmp/json-streamer.h +++ b/include/qapi/qmp/json-streamer.h @@ -16,13 +16,6 @@ #include "qapi/qmp/json-lexer.h" -typedef struct JSONToken { - int type; - int x; - int y; - char str[]; -} JSONToken; - typedef struct JSONMessageParser { void (*emit)(void *opaque, QObject *json, Error *err); |