OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

json-parser: simplify and avoid JSONParserContext allocation 

parser_context_new/free() are only used from json_parser_parse(). We
can fold the code there and avoid an allocation altogether.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180719184111.5129-9-marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180823164025.12553-33-armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-08-23 18:39:59 +02:00 committed by Markus Armbruster
parent 7c1e1d5481
commit e8b19d7d73
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
qobject/json-parser.c
View File

@ -237,33 +237,6 @@ static JSONToken *parser_context_peek_token(JSONParserContext *ctxt)
return g_queue_peek_head(ctxt->buf);
}
static JSONParserContext *parser_context_new(GQueue *tokens)
{
JSONParserContext *ctxt;
if (!tokens) {
return NULL;
}
ctxt = g_malloc0(sizeof(JSONParserContext));
ctxt->buf = tokens;
return ctxt;
}
/* to support error propagation, ctxt->err must be freed separately */
static void parser_context_free(JSONParserContext *ctxt)
{
if (ctxt) {
while (!g_queue_is_empty(ctxt->buf)) {
parser_context_pop_token(ctxt);
}
g_free(ctxt->current);
g_queue_free(ctxt->buf);
g_free(ctxt);
}
}
/**
* Parsing rules
*/
@ -575,18 +548,22 @@ QObject *json_parser_parse(GQueue *tokens, va_list *ap)
QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp)
{
JSONParserContext *ctxt = parser_context_new(tokens);
JSONParserContext ctxt = { .buf = tokens };
QObject *result;
if (!ctxt) {
if (!tokens) {
return NULL;
}
result = parse_value(ctxt, ap);
result = parse_value(&ctxt, ap);
error_propagate(errp, ctxt->err);
error_propagate(errp, ctxt.err);
parser_context_free(ctxt);
while (!g_queue_is_empty(ctxt.buf)) {
parser_context_pop_token(&ctxt);
}
g_free(ctxt.current);
g_queue_free(ctxt.buf);
return result;
}