diff mbox

Fix misleading indentation warnings

Message ID 20161110083718.4043-1-cbosdonnat@suse.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cedric Bosdonnat Nov. 10, 2016, 8:37 a.m. UTC 
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(-)

Comments

Jürgen Groß Nov. 10, 2016, 8:42 a.m. UTC | #1 
On 10/11/16 09:37, Cédric Bosdonnat wrote:
> Gcc6 build reports misleading indentation as warnings. Fix a few
> warnings in stubdom.

You should CC: the maintainers. Calling

./scripts/get_maintainer.pl <patchfile>

will show them. Added them for now.


Juergen

> ---
>  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");
>  }
>
Cedric Bosdonnat Nov. 10, 2016, 9:25 a.m. UTC | #2 
Hi Juergen,

Just resent the patch with the missing Signed-off-By and --cc-cmd './scripts/get_maintainers.pl'

--
Cedric

On Thu, 2016-11-10 at 09:42 +0100, Juergen Gross wrote:
> On 10/11/16 09:37, Cédric Bosdonnat wrote:
> > Gcc6 build reports misleading indentation as warnings. Fix a few
> > warnings in stubdom.
> 
> You should CC: the maintainers. Calling
> 
> ./scripts/get_maintainer.pl <patchfile>
> 
> will show them. Added them for now.
> 
> 
> Juergen
> 
> > ---
> >  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");
> >  }
> > 
> 
>
diff mbox

Patch

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");
 }