| Message ID | 20161110092331.6375-1-cbosdonnat@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/10/2016 04:23 AM, Cédric Bosdonnat wrote: > 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>
On November 10, 2016 11:25 PM, Daniel De Graaf wrote: >On 11/10/2016 04:23 AM, Cédric Bosdonnat wrote: >> 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>
On Thu, Nov 10, 2016 at 10:23:31AM +0100, Cédric Bosdonnat wrote: > Gcc6 build reports misleading indentation as warnings. Fix a few > warnings in stubdom. > > Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com> Applied.
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"); }
Gcc6 build reports misleading indentation as warnings. Fix a few warnings in stubdom. Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com> --- stubdom/vtpmmgr/disk_read.c | 8 ++++---- stubdom/vtpmmgr/log.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)