[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword() and simplify |
Date: |
Wed, 25 Nov 2015 15:09:46 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 |
On 11/25/2015 02:23 PM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> qobject/json-parser.c | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
>
> - if (token_is_keyword(token, "true")) {
> + val = token_get_value(token);
> +
> + if (!strcmp(val, "true")) {
> ret = QOBJECT(qbool_from_bool(true));
> - } else if (token_is_keyword(token, "false")) {
> + } else if (!strcmp(val, "false")) {
> ret = QOBJECT(qbool_from_bool(false));
> - } else if (token_is_keyword(token, "null")) {
> + } else if (!strcmp(val, "null")) {
> ret = qnull();
> } else {
> - parse_error(ctxt, token, "invalid keyword `%s'",
> token_get_value(token));
> + parse_error(ctxt, token, "invalid keyword '%s'", val);
Yay - fewer `' in error messages. (Great back in the day when fonts
rendered them symmetrically, and still useful in m4; but lousy for
pasting into shell code and in modern fonts)
Reviewed-by: Eric Blake <address@hidden>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of memory, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 01/12] qjson: Apply nesting limit more sanely, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword() and simplify, Markus Armbruster, 2015/11/25
- Re: [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword() and simplify,
Eric Blake <=
- [Qemu-devel] [PATCH v3 for-2.5 07/12] qjson: Inline token_is_escape() and simplify, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 03/12] check-qjson: Add test for JSON nesting depth limit, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 04/12] qjson: Spell out some silent assumptions, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 12/12] qjson: Limit number of tokens in addition to total size, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 08/12] qjson: replace QString in JSONLexer with GString, Markus Armbruster, 2015/11/25