commit abe7c2067c21a89c6fd4cf2d8ba2fa37160d1d55
author Markus Armbruster <armbru@redhat.com> Thu Aug 23 18:40:18 2018 +0200
committer Markus Armbruster <armbru@redhat.com> Fri Aug 24 20:26:37 2018 +0200
tree 9b47fe3f0c5dc56c37c6ba9ef7072ea6d7276706
parent a2731e08ee8633fcdc2af944b8f8f315678f7669

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>

qobject/json-streamer.c

diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index 9210281..467bc29 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -82,13 +82,7 @@
         goto out_emit;
     }
 
-    token = g_malloc(sizeof(JSONToken) + input->len + 1);
-    token->type = type;
-    memcpy(token->str, input->str, input->len);
-    token->str[input->len] = 0;
-    token->x = x;
-    token->y = y;
-
+    token = json_token(type, x, y, input);
     parser->token_size += input->len;
 
     g_queue_push_tail(&parser->tokens, token);