[Xen-devel] [PATCH STABLE BACKPORT for-4.7] Fix misleading indentation warnings

Ian Jackson posted 1 patch 4 years, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/xen tags/patchew/20190501140257.27564-1-ian.jackson@eu.citrix.com
stubdom/vtpmmgr/disk_read.c | 8 ++++----
stubdom/vtpmmgr/log.c       | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
[Xen-devel] [PATCH STABLE BACKPORT for-4.7] Fix misleading indentation warnings
Posted by Ian Jackson 4 years, 11 months ago
From: Cédric Bosdonnat <cbosdonnat@suse.com>

Gcc6 build reports misleading indentation as warnings. Fix a few
warnings in stubdom.

Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Acked-by: Quan Xu <xuquan8@huawei.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
(cherry picked from commit 9fdffbbab3ada427bac07076f042f0265e5ae05f)
---
 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 944d3ffda6..48cfbfe6d5 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 a82c9139c3..c1bc8f3e42 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");
 }
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel