From patchwork Fri Apr 29 04:23:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8977001 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2AA749F54E for ; Fri, 29 Apr 2016 04:26:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83DFC20220 for ; Fri, 29 Apr 2016 04:26:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC7D3201C0 for ; Fri, 29 Apr 2016 04:26:27 +0000 (UTC) Received: from localhost ([::1]:52216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw00Y-0003Wh-Vy for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Apr 2016 00:26:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avzy4-0007D0-53 for qemu-devel@nongnu.org; Fri, 29 Apr 2016 00:23:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avzy3-0000tE-AD for qemu-devel@nongnu.org; Fri, 29 Apr 2016 00:23:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avzy3-0000sy-3v for qemu-devel@nongnu.org; Fri, 29 Apr 2016 00:23:51 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CCBC181F03 for ; Fri, 29 Apr 2016 04:23:50 +0000 (UTC) Received: from red.redhat.com (ovpn-113-21.phx2.redhat.com [10.3.113.21]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3T4Ngf6016324; Fri, 29 Apr 2016 00:23:49 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2016 22:23:30 -0600 Message-Id: <1461903820-3092-10-git-send-email-eblake@redhat.com> In-Reply-To: <1461903820-3092-1-git-send-email-eblake@redhat.com> References: <1461903820-3092-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 09/18] Revert "qjson: Simplify by using json-output-visitor" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: famz@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Showing two alternative approaches; revert approach 1 to go forward with approach 2 This reverts commit 7af47db0b00e982231399a81a3af490d84aee010. --- qjson.c | 61 +++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/qjson.c b/qjson.c index 17cc962..d172b1f 100644 --- a/qjson.c +++ b/qjson.c @@ -12,85 +12,102 @@ */ #include "qemu/osdep.h" +#include +#include #include #include #include -#include "qapi/json-output-visitor.h" -#include "qapi/error.h" struct QJSON { Object obj; - JsonOutputVisitor *jov; - char *str; + QString *str; + bool omit_comma; }; #define QJSON(obj) OBJECT_CHECK(QJSON, (obj), TYPE_QJSON) +static void json_emit_element(QJSON *json, const char *name) +{ + /* Check whether we need to print a , before an element */ + if (json->omit_comma) { + json->omit_comma = false; + } else { + qstring_append(json->str, ", "); + } + + if (name) { + qstring_append_json_string(json->str, name); + qstring_append(json->str, " : "); + } +} + void json_start_object(QJSON *json, const char *name) { - Visitor *v = json_output_get_visitor(json->jov); - visit_start_struct(v, name, NULL, 0, &error_abort); + json_emit_element(json, name); + qstring_append(json->str, "{ "); + json->omit_comma = true; } void json_end_object(QJSON *json) { - Visitor *v = json_output_get_visitor(json->jov); - visit_check_struct(v, &error_abort); - visit_end_struct(v); + qstring_append(json->str, " }"); + json->omit_comma = false; } void json_start_array(QJSON *json, const char *name) { - Visitor *v = json_output_get_visitor(json->jov); - visit_start_list(v, name, NULL, 0, &error_abort); + json_emit_element(json, name); + qstring_append(json->str, "[ "); + json->omit_comma = true; } void json_end_array(QJSON *json) { - Visitor *v = json_output_get_visitor(json->jov); - visit_end_list(v); + qstring_append(json->str, " ]"); + json->omit_comma = false; } void json_prop_int(QJSON *json, const char *name, int64_t val) { - Visitor *v = json_output_get_visitor(json->jov); - visit_type_int(v, name, &val, &error_abort); + json_emit_element(json, name); + qstring_append_format(json->str, "%" PRId64, val); } void json_prop_str(QJSON *json, const char *name, const char *str) { - Visitor *v = json_output_get_visitor(json->jov); - visit_type_str(v, name, (char **)&str, &error_abort); + json_emit_element(json, name); + qstring_append_json_string(json->str, str); } const char *qjson_get_str(QJSON *json) { - return json->str; + return qstring_get_str(json->str); } QJSON *qjson_new(void) { QJSON *json = QJSON(object_new(TYPE_QJSON)); - json_start_object(json, NULL); return json; } void qjson_finish(QJSON *json) { json_end_object(json); - json->str = json_output_get_string(json->jov); } static void qjson_initfn(Object *obj) { QJSON *json = QJSON(obj); - json->jov = json_output_visitor_new(); + + json->str = qstring_from_str("{ "); + json->omit_comma = true; } static void qjson_finalizefn(Object *obj) { QJSON *json = QJSON(obj); - g_free(json->str); + + qobject_decref(QOBJECT(json->str)); } static const TypeInfo qjson_type_info = {