From patchwork Thu Feb 4 02:30:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Tam X-Patchwork-Id: 44446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 825C8B7D39 for ; Thu, 4 Feb 2010 13:37:10 +1100 (EST) Received: from localhost ([127.0.0.1]:37822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcrXo-0007fY-M7 for incoming@patchwork.ozlabs.org; Wed, 03 Feb 2010 21:34:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcrWC-0007LJ-A9 for qemu-devel@nongnu.org; Wed, 03 Feb 2010 21:32:32 -0500 Received: from [199.232.76.173] (port=38001 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcrWB-0007Kv-Rf for qemu-devel@nongnu.org; Wed, 03 Feb 2010 21:32:31 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcrWA-00053r-R2 for qemu-devel@nongnu.org; Wed, 03 Feb 2010 21:32:31 -0500 Received: from mail-px0-f189.google.com ([209.85.216.189]:49133) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NcrWA-00053c-IB for qemu-devel@nongnu.org; Wed, 03 Feb 2010 21:32:30 -0500 Received: by pxi27 with SMTP id 27so2061790pxi.4 for ; Wed, 03 Feb 2010 18:32:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:cc:content-type; bh=UWiDmYYdgcLTy1AxMxoinH9TsRWm50Ev+rGvtLIqOOY=; b=j1+0OcXST48EfQVDYn7jMcICdUOv9hfawywz9SceLN+D4MtgCy+qo5htuXbvNVe/E9 QYMM66l4Jm4zVck3CckrYvL9vEh1tBahj1HNslspaktKcqqVujGpKsnHUBCYfUtzRIRM 1JtJP/eZSwKfyROVzDZAwXIzId/CJmK6O7gNs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:cc:content-type; b=O2qFvfi7vULkxoC3loCV9ciT1K0qXIygKhFs0j2wUQj6A8H84ZX/GNFK8K1l3O6nFl mgMBoIEF45KaQwLHr3ltZYhxgV21OfVarRb5y6nTBBfl+FDkgzyDCgwZCekQeNM6d6V+ BwAKEwYVDjjKyEhN1FvdMHfctK6hMBSbeRbzA= MIME-Version: 1.0 Received: by 10.114.6.1 with SMTP id 1mr334431waf.104.1265250748354; Wed, 03 Feb 2010 18:32:28 -0800 (PST) From: Roy Tam Date: Thu, 4 Feb 2010 10:30:30 +0800 Message-ID: <473191351002031830w7876c367vf534508e292c4f04@mail.gmail.com> Subject: [PATCH] JSON: add %I64d support (Was: Re: [Qemu-devel] system_reset command cause assert failed) To: Luiz Capitulino X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 2010/2/4 Roy Tam : > 2010/2/3 Luiz Capitulino : OK we are fooled by the json lexer and parser. As we use %I64d to print 'long long' variables in Win32, but lexer and parser only deal with %lld but not %I64d, this patch add support for %I64d and solve 'info pci', 'powser_reset' and 'power_powerdown' assert failure in Win32. P.S.: an assert(state.result != NULL) statement in qobject_from_jsonv() will be good for asserting failure of parsing JSON strings. } else if (token_is_escape(token, "%s")) { obj = QOBJECT(qstring_from_str(va_arg(*ap, const char *))); diff --git a/json-lexer.c b/json-lexer.c index 53697c5..9d64920 100644 --- a/json-lexer.c +++ b/json-lexer.c @@ -54,6 +54,9 @@ enum json_lexer_state { IN_ESCAPE, IN_ESCAPE_L, IN_ESCAPE_LL, + IN_ESCAPE_I, + IN_ESCAPE_I6, + IN_ESCAPE_I64, IN_ESCAPE_DONE, IN_WHITESPACE, IN_OPERATOR_DONE, @@ -223,6 +226,18 @@ static const uint8_t json_lexer[][256] = { ['l'] = IN_ESCAPE_LL, }, + [IN_ESCAPE_I64] = { + ['d'] = IN_ESCAPE_DONE, + }, + + [IN_ESCAPE_I6] = { + ['4'] = IN_ESCAPE_I64, + }, + + [IN_ESCAPE_I] = { + ['6'] = IN_ESCAPE_I6, + }, + [IN_ESCAPE] = { ['d'] = IN_ESCAPE_DONE, ['i'] = IN_ESCAPE_DONE, @@ -230,6 +245,7 @@ static const uint8_t json_lexer[][256] = { ['s'] = IN_ESCAPE_DONE, ['f'] = IN_ESCAPE_DONE, ['l'] = IN_ESCAPE_L, + ['I'] = IN_ESCAPE_I, }, /* top level rule */ diff --git a/json-parser.c b/json-parser.c index e04932f..40a5d15 100644 --- a/json-parser.c +++ b/json-parser.c @@ -474,7 +474,7 @@ static QObject *parse_escape(JSONParserContext *ctxt, QList **tokens, va_list *a obj = QOBJECT(qint_from_int(va_arg(*ap, int))); } else if (token_is_escape(token, "%ld")) { obj = QOBJECT(qint_from_int(va_arg(*ap, long))); - } else if (token_is_escape(token, "%lld")) { + } else if (token_is_escape(token, "%lld") || token_is_escape(token, "%I64d")) { obj = QOBJECT(qint_from_int(va_arg(*ap, long long)));