[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen staging-4.6] Fix misleading indentation warnings



commit 6e1b057b63b2e1d04e62e5a072734746310ff987
Author:     Cédric Bosdonnat <cbosdonnat@xxxxxxxx>
AuthorDate: Thu Nov 10 10:23:31 2016 +0100
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Tue May 7 11:37:44 2019 +0100

    Fix misleading indentation warnings
    
    Gcc6 build reports misleading indentation as warnings. Fix a few
    warnings in stubdom.
    
    Signed-off-by: Cédric Bosdonnat <cbosdonnat@xxxxxxxx>
    Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
    Acked-by: Quan Xu <xuquan8@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 9fdffbbab3ada427bac07076f042f0265e5ae05f)
    (cherry picked from commit 7c8db58d3739c805f4c0f773b65157f306b00c2a)
---
 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");
 }
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.