From patchwork Tue Nov 23 18:49:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 72724 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 CA452B70DF for ; Wed, 24 Nov 2010 05:57:10 +1100 (EST) Received: from localhost ([127.0.0.1]:55227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKy3A-0005Lm-5i for incoming@patchwork.ozlabs.org; Tue, 23 Nov 2010 13:57:08 -0500 Received: from [140.186.70.92] (port=41367 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKxwB-0001c2-0T for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:49:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKxw9-0005rr-Ut for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:49:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKxw9-0005rl-Nz for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:49:53 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oANInqxQ005378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 23 Nov 2010 13:49:53 -0500 Received: from localhost ([10.3.113.10]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oANInpWj021027 for ; Tue, 23 Nov 2010 13:49:52 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 23 Nov 2010 16:49:35 -0200 Message-Id: <1290538175-2437-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1290538175-2437-1-git-send-email-lcapitulino@redhat.com> References: <1290538175-2437-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 3/3] QMP: Simplify monitor_json_emitter() 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 Use the ternary operator instead of an if (also fixes bad indentation). Signed-off-by: Luiz Capitulino --- monitor.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index 30be273..f6f2264 100644 --- a/monitor.c +++ b/monitor.c @@ -351,10 +351,8 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data) { QString *json; - if (mon->flags & MONITOR_USE_PRETTY) - json = qobject_to_json_pretty(data); - else - json = qobject_to_json(data); + json = mon->flags & MONITOR_USE_PRETTY ? qobject_to_json_pretty(data) : + qobject_to_json(data); assert(json != NULL); qstring_append_chr(json, '\n');