[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 09/18] json-parser: further simplify freeing
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v2 09/18] json-parser: further simplify freeing JSONParserContext |
Date: |
Fri, 20 Jul 2018 08:40:31 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Marc-André Lureau <address@hidden> writes:
> Use g_queue_free_full() directly.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
> qobject/json-parser.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/qobject/json-parser.c b/qobject/json-parser.c
> index 6baf73b4b9..0c0b478149 100644
> --- a/qobject/json-parser.c
> +++ b/qobject/json-parser.c
> @@ -561,11 +561,8 @@ QObject *json_parser_parse(GQueue *tokens, va_list *ap,
> Error **errp)
>
> error_propagate(errp, ctxt.err);
>
> - while (!g_queue_is_empty(ctxt.buf)) {
> - parser_context_pop_token(&ctxt);
> - }
> + g_queue_free_full(ctxt.buf, g_free);
> g_free(ctxt.current);
> - g_queue_free(ctxt.buf);
>
> return result;
> }
Enabled by our recent upgrade to GLib 2.40 (commit e7b3af81).
Dots into JSONParserContext, but it did so before the patch already.
Perhaps turning JSONParserContext into a proper abstract data type would
be slightly cleaner, but it doesn't seem worth the effort.
Reviewed-by: Markus Armbruster <address@hidden>
- [Qemu-devel] [PATCH v2 05/18] monitor: no need to save need_resume, (continued)
- [Qemu-devel] [PATCH v2 09/18] json-parser: further simplify freeing JSONParserContext, Marc-André Lureau, 2018/07/19
- Re: [Qemu-devel] [PATCH v2 09/18] json-parser: further simplify freeing JSONParserContext,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 06/18] qga: process_event() simplification and leak fix, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 07/18] qmp: drop json_parser_parse() wrapper, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 13/18] json-parser: set an error if parsing returned NULL, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 15/18] tests: add a few qemu-qmp tests, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 14/18] json-lexer: make it safe to call multiple times, Marc-André Lureau, 2018/07/19
- [Qemu-devel] [PATCH v2 12/18] qjson: return parsing error if unterminated input, Marc-André Lureau, 2018/07/19