From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuIEw-0007Cz-UV for qemu-devel@nongnu.org; Tue, 10 Jun 2014 05:21:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WuIEr-0002SS-Vc for qemu-devel@nongnu.org; Tue, 10 Jun 2014 05:21:10 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:50799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuIEr-0002Rp-CC for qemu-devel@nongnu.org; Tue, 10 Jun 2014 05:21:05 -0400 From: Date: Tue, 10 Jun 2014 17:20:24 +0800 Message-ID: <1402392027-9164-2-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1402392027-9164-1-git-send-email-arei.gonglei@huawei.com> References: <1402392027-9164-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v3 1/4] json-parser: drop superfluous assignment for token variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ChenLiang , weidong.huang@huawei.com, luonengjun@huawei.com, lcapitulino@redhat.com, Gonglei , av1474@comtv.ru, kraxel@redhat.com, stefanha@redhat.com, pbonzini@redhat.com From: Gonglei Signed-off-by: ChenLiang Signed-off-by: Gonglei --- qobject/json-parser.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/qobject/json-parser.c b/qobject/json-parser.c index e46c264..4288267 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -423,7 +423,6 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) if (!token_is_operator(token, '{')) { goto out; } - token = NULL; dict = qdict_new(); @@ -449,7 +448,6 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) parse_error(ctxt, token, "expected separator in dict"); goto out; } - token = NULL; if (parse_pair(ctxt, dict, ap) == -1) { goto out; @@ -461,10 +459,8 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) goto out; } } - token = NULL; } else { - token = parser_context_pop_token(ctxt); - token = NULL; + (void)parser_context_pop_token(ctxt); } return QOBJECT(dict); @@ -487,10 +483,8 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) } if (!token_is_operator(token, '[')) { - token = NULL; goto out; } - token = NULL; list = qlist_new(); @@ -523,8 +517,6 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) goto out; } - token = NULL; - obj = parse_value(ctxt, ap); if (obj == NULL) { parse_error(ctxt, token, "expecting value"); @@ -539,11 +531,8 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) goto out; } } - - token = NULL; } else { - token = parser_context_pop_token(ctxt); - token = NULL; + (void)parser_context_pop_token(ctxt); } return QOBJECT(list); -- 1.7.12.4