From patchwork Thu Apr 2 17:29:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 457740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1A5FD14007D for ; Fri, 3 Apr 2015 04:30:07 +1100 (AEDT) Received: from localhost ([::1]:59536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdiwO-0001WK-VI for incoming@patchwork.ozlabs.org; Thu, 02 Apr 2015 13:30:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydivm-0000OM-6Y for qemu-devel@nongnu.org; Thu, 02 Apr 2015 13:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydivl-0007OS-Gb for qemu-devel@nongnu.org; Thu, 02 Apr 2015 13:29:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydivl-0007Nf-38 for qemu-devel@nongnu.org; Thu, 02 Apr 2015 13:29:25 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t32HTIFu022151 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 2 Apr 2015 13:29:18 -0400 Received: from blackfin.pond.sub.org (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t32HTELU010895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 2 Apr 2015 13:29:17 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E48D5305D0EE; Thu, 2 Apr 2015 19:29:04 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 2 Apr 2015 19:29:02 +0200 Message-Id: <1427995743-7865-19-git-send-email-armbru@redhat.com> In-Reply-To: <1427995743-7865-1-git-send-email-armbru@redhat.com> References: <1427995743-7865-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, berto@igalia.com, akong@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH RFC 18/19] json-parser: Fix to recognize null X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qobject/json-parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 4288267..717cb8f 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -561,6 +561,8 @@ static QObject *parse_keyword(JSONParserContext *ctxt) ret = QOBJECT(qbool_from_int(true)); } else if (token_is_keyword(token, "false")) { ret = QOBJECT(qbool_from_int(false)); + } else if (token_is_keyword(token, "null")) { + ret = qnull(); } else { parse_error(ctxt, token, "invalid keyword `%s'", token_get_value(token)); goto out;