From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH2L-000748-CW for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyH2I-0003dk-8a for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH2I-0003dJ-3Z for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:06 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id ABF14B8BC8 for ; Fri, 29 May 2015 09:57:05 +0000 (UTC) From: Markus Armbruster Date: Fri, 29 May 2015 11:56:52 +0200 Message-Id: <1432893420-18687-14-git-send-email-armbru@redhat.com> In-Reply-To: <1432893420-18687-1-git-send-email-armbru@redhat.com> References: <1432893420-18687-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 13/21] monitor: Inline monitor_has_error() into its only caller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- monitor.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 56564d5..91f8a4e 100644 --- a/monitor.c +++ b/monitor.c @@ -377,11 +377,6 @@ static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, return 0; } -static inline int monitor_has_error(const Monitor *mon) -{ - return mon->error != NULL; -} - static void monitor_json_emitter(Monitor *mon, const QObject *data) { QString *json; @@ -5031,7 +5026,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) if (cmd->mhandler.cmd_new(mon, args, &data)) { /* Command failed... */ - if (!monitor_has_error(mon)) { + if (!mon->error) { /* ... without setting an error, so make one up */ qerror_report(QERR_UNDEFINED_ERROR); } -- 1.9.3