From patchwork Thu Nov 10 08:37:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Bosdonnat X-Patchwork-Id: 9420733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C1B5860484 for ; Thu, 10 Nov 2016 08:39:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B668E29578 for ; Thu, 10 Nov 2016 08:39:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A923029581; Thu, 10 Nov 2016 08:39:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3A08629578 for ; Thu, 10 Nov 2016 08:39:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c4krQ-0001B9-J5; Thu, 10 Nov 2016 08:37:28 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c4krP-0001B3-EW for xen-devel@lists.xen.org; Thu, 10 Nov 2016 08:37:27 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id C8/0D-12520-6C134285; Thu, 10 Nov 2016 08:37:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRWlGSWpSXmKPExsVyuP0uq+4xQ5U Ig+fzGC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozmI58ZCx5zVuyaOYWlgXEKRxcjF4eQwBJG iR0P77B2MXJysAnYS3T9OcoEYosISEtc+3yZEcRmFrCVOLn+BwuILSxgItG2sQesnkVAVaK57 ys7iM0rYC6x6tgBsBoJAXmJC1dPsUxg5FjAyLCKUaM4tagstUjXyEQvqSgzPaMkNzEzR9fQwE wvN7W4ODE9NScxqVgvOT93EyPQLwxAsINx5brAQ4ySHExKorzi95QjhPiS8lMqMxKLM+KLSnN Siw8xynBwKEnwMhioRAgJFqWmp1akZeYAAwQmLcHBoyTCe14fKM1bXJCYW5yZDpE6xagoJc77 BCQhAJLIKM2Da4MF5SVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ83qBbOfJzCuBm/4KaDET0 OKqGAWQxSWJCCmpBkb7Cy43OX70Fzruin5waH43W2L+L6vwvw+6KvtfVOxsfKhyPiVp3TkbZi ON6bwsO/Na5t7q3uUVLZsbklNl+3yqi8jxL7q2XYePyCz+Lrb4RrdOj5vam/KoO9e4np6SfPm 0u6fxUOj2VjU/bn+3Q1lFR9hvxT1nVjrQpCy/Xv5um2o1w9b/u5RYijMSDbWYi4oTAdUu8QtF AgAA X-Env-Sender: cbosdonnat@suse.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1478767045!60622196!1 X-Originating-IP: [195.135.221.5] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56031 invoked from network); 10 Nov 2016 08:37:25 -0000 Received: from smtp.nue.novell.com (HELO smtp.nue.novell.com) (195.135.221.5) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Nov 2016 08:37:25 -0000 Received: from laptop.vms (mhy71-2-88-167-63-197.fbx.proxad.net [88.167.63.197]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Thu, 10 Nov 2016 09:37:24 +0100 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= To: xen-devel@lists.xen.org Date: Thu, 10 Nov 2016 09:37:18 +0100 Message-Id: <20161110083718.4043-1-cbosdonnat@suse.com> X-Mailer: git-send-email 2.10.1 Cc: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Subject: [Xen-devel] [PATCH] Fix misleading indentation warnings X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Gcc6 build reports misleading indentation as warnings. Fix a few warnings in stubdom. --- stubdom/vtpmmgr/disk_read.c | 8 ++++---- stubdom/vtpmmgr/log.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stubdom/vtpmmgr/disk_read.c b/stubdom/vtpmmgr/disk_read.c index 944d3ff..48cfbfe 100644 --- a/stubdom/vtpmmgr/disk_read.c +++ b/stubdom/vtpmmgr/disk_read.c @@ -123,10 +123,10 @@ static int parse_root_key(struct mem_tpm_mgr *dst, struct disk_seal_entry *src) struct disk_root_sealed_data sealed; /*TPM 2.0 unbind | TPM 1.x unseal*/ - if (hw_is_tpm2()) - rc = TPM2_disk_unbind(&sealed, &olen, src); - else - rc = TPM_disk_unseal(&sealed, sizeof(sealed), src); + if (hw_is_tpm2()) + rc = TPM2_disk_unbind(&sealed, &olen, src); + else + rc = TPM_disk_unseal(&sealed, sizeof(sealed), src); if (rc) return rc; diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c index a82c913..c1bc8f3 100644 --- a/stubdom/vtpmmgr/log.c +++ b/stubdom/vtpmmgr/log.c @@ -147,5 +147,5 @@ const char* tpm_get_error_name (TPM_RESULT code) { if (code == error_msgs[i].code) return error_msgs[i].code_name; - return("Unknown Error Code"); + return("Unknown Error Code"); }