From patchwork Mon Aug 30 15:35:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 63057 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 07A09B70F0 for ; Tue, 31 Aug 2010 01:43:39 +1000 (EST) Received: from localhost ([127.0.0.1]:34380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq6WG-0002nF-Fg for incoming@patchwork.ozlabs.org; Mon, 30 Aug 2010 11:43:36 -0400 Received: from [140.186.70.92] (port=43961 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq6PA-0007rp-FV for qemu-devel@nongnu.org; Mon, 30 Aug 2010 11:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oq6P9-0003XE-9A for qemu-devel@nongnu.org; Mon, 30 Aug 2010 11:36:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9631) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oq6P8-0003Wx-W0 for qemu-devel@nongnu.org; Mon, 30 Aug 2010 11:36:15 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7UFaD3i015617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 30 Aug 2010 11:36:13 -0400 Received: from localhost6.localdomain6 ([10.3.121.6]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7UFZnEA010962; Mon, 30 Aug 2010 11:36:12 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Mon, 30 Aug 2010 17:35:44 +0200 Message-Id: <1283182547-26116-12-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1283182547-26116-1-git-send-email-Jes.Sorensen@redhat.com> References: <1283182547-26116-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, Jes.Sorensen@redhat.com Subject: [Qemu-devel] [PATCH 11/14] Remove unused function arguments 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 From: Jes Sorensen Signed-off-by: Jes Sorensen --- json-parser.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/json-parser.c b/json-parser.c index 70b9b6f..68ff9c1 100644 --- a/json-parser.c +++ b/json-parser.c @@ -91,7 +91,7 @@ static int token_is_escape(QObject *obj, const char *value) /** * Error handler */ -static void parse_error(JSONParserContext *ctxt, QObject *token, const char *msg, ...) +static void parse_error(const char *msg, ...) { va_list ap; va_start(ap, msg); @@ -165,7 +165,7 @@ static int hex2decimal(char ch) * \t * \u four-hex-digits */ -static QString *qstring_from_escaped_str(JSONParserContext *ctxt, QObject *token) +static QString *qstring_from_escaped_str(QObject *token) { const char *ptr = token_get_value(token); QString *str; @@ -232,8 +232,7 @@ static QString *qstring_from_escaped_str(JSONParserContext *ctxt, QObject *token if (qemu_isxdigit(*ptr)) { unicode_char |= hex2decimal(*ptr) << ((3 - i) * 4); } else { - parse_error(ctxt, token, - "invalid hex escape sequence in string"); + parse_error("invalid hex escape sequence in string"); goto out; } ptr++; @@ -243,7 +242,7 @@ static QString *qstring_from_escaped_str(JSONParserContext *ctxt, QObject *token qstring_append(str, utf8_char); } break; default: - parse_error(ctxt, token, "invalid escape sequence in string"); + parse_error("invalid escape sequence in string"); goto out; } } else { @@ -274,19 +273,19 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, QList **tokens, va_l peek = qlist_peek(working); key = parse_value(ctxt, &working, ap); if (!key || qobject_type(key) != QTYPE_QSTRING) { - parse_error(ctxt, peek, "key is not a string in object"); + parse_error("key is not a string in object"); goto out; } token = qlist_pop(working); if (!token_is_operator(token, ':')) { - parse_error(ctxt, token, "missing : in object pair"); + parse_error("missing : in object pair"); goto out; } value = parse_value(ctxt, &working, ap); if (value == NULL) { - parse_error(ctxt, token, "Missing value in dict"); + parse_error("Missing value in dict"); goto out; } @@ -331,7 +330,7 @@ static QObject *parse_object(JSONParserContext *ctxt, QList **tokens, va_list *a token = qlist_pop(working); while (!token_is_operator(token, '}')) { if (!token_is_operator(token, ',')) { - parse_error(ctxt, token, "expected separator in dict"); + parse_error("expected separator in dict"); goto out; } qobject_decref(token); @@ -384,7 +383,7 @@ static QObject *parse_array(JSONParserContext *ctxt, QList **tokens, va_list *ap obj = parse_value(ctxt, &working, ap); if (obj == NULL) { - parse_error(ctxt, token, "expecting value"); + parse_error("expecting value"); goto out; } @@ -393,7 +392,7 @@ static QObject *parse_array(JSONParserContext *ctxt, QList **tokens, va_list *ap token = qlist_pop(working); while (!token_is_operator(token, ']')) { if (!token_is_operator(token, ',')) { - parse_error(ctxt, token, "expected separator in list"); + parse_error("expected separator in list"); goto out; } @@ -402,7 +401,7 @@ static QObject *parse_array(JSONParserContext *ctxt, QList **tokens, va_list *ap obj = parse_value(ctxt, &working, ap); if (obj == NULL) { - parse_error(ctxt, token, "expecting value"); + parse_error("expecting value"); goto out; } @@ -431,7 +430,7 @@ out: return NULL; } -static QObject *parse_keyword(JSONParserContext *ctxt, QList **tokens) +static QObject *parse_keyword(QList **tokens) { QObject *token, *ret; QList *working = qlist_copy(*tokens); @@ -447,7 +446,7 @@ static QObject *parse_keyword(JSONParserContext *ctxt, QList **tokens) } else if (token_is_keyword(token, "false")) { ret = QOBJECT(qbool_from_int(false)); } else { - parse_error(ctxt, token, "invalid keyword `%s'", token_get_value(token)); + parse_error("invalid keyword `%s'", token_get_value(token)); goto out; } @@ -464,7 +463,7 @@ out: return NULL; } -static QObject *parse_escape(JSONParserContext *ctxt, QList **tokens, va_list *ap) +static QObject *parse_escape(QList **tokens, va_list *ap) { QObject *token = NULL, *obj; QList *working = qlist_copy(*tokens); @@ -507,7 +506,7 @@ out: return NULL; } -static QObject *parse_literal(JSONParserContext *ctxt, QList **tokens) +static QObject *parse_literal(QList **tokens) { QObject *token, *obj; QList *working = qlist_copy(*tokens); @@ -515,7 +514,7 @@ static QObject *parse_literal(JSONParserContext *ctxt, QList **tokens) token = qlist_pop(working); switch (token_get_type(token)) { case JSON_STRING: - obj = QOBJECT(qstring_from_escaped_str(ctxt, token)); + obj = QOBJECT(qstring_from_escaped_str(token)); break; case JSON_INTEGER: obj = QOBJECT(qint_from_int(strtoll(token_get_value(token), NULL, 10))); @@ -550,13 +549,13 @@ static QObject *parse_value(JSONParserContext *ctxt, QList **tokens, va_list *ap obj = parse_array(ctxt, tokens, ap); } if (obj == NULL) { - obj = parse_escape(ctxt, tokens, ap); + obj = parse_escape(tokens, ap); } if (obj == NULL) { - obj = parse_keyword(ctxt, tokens); + obj = parse_keyword(tokens); } if (obj == NULL) { - obj = parse_literal(ctxt, tokens); + obj = parse_literal(tokens); } return obj;