[edk2] EmbeddedPkg: AndroidBootApp: fix clang compilation

Message ID 20171206203130.8219-1-leif.lindholm@linaro.org
State Accepted
Commit ac811846f2db75335be74878a323d5602d595d79
Headers show
Series
  • [edk2] EmbeddedPkg: AndroidBootApp: fix clang compilation
Related show

Commit Message

Leif Lindholm Dec. 6, 2017, 8:31 p.m.
Address an incorrect function prototype (using ; instead of ,)
in AndroidBootImg.h.

Also restructure code slightly to avoid a "may be used uninitialized"
warning.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 EmbeddedPkg/Include/Protocol/AndroidBootImg.h             | 4 ++--
 EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Dec. 6, 2017, 8:36 p.m. | #1
On 6 December 2017 at 20:31, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Address an incorrect function prototype (using ; instead of ,)

> in AndroidBootImg.h.

>

> Also restructure code slightly to avoid a "may be used uninitialized"

> warning.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---

>  EmbeddedPkg/Include/Protocol/AndroidBootImg.h             | 4 ++--

>  EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c | 9 +++++----

>  2 files changed, 7 insertions(+), 6 deletions(-)

>

> diff --git a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h

> index 1c458d0255..cd3c42e858 100644

> --- a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h

> +++ b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h

> @@ -33,8 +33,8 @@ EFI_STATUS

>  typedef

>  EFI_STATUS

>  (EFIAPI *ANDROID_BOOTIMG_UPDATE_DTB) (

> -  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase;

> -  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase;

> +  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase,

> +  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase

>    );

>

>  struct _ANDROID_BOOTIMG_PROTOCOL {

> diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

> index 09c4d924f1..2e50cedf6a 100644

> --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

> +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

> @@ -357,12 +357,13 @@ AndroidBootImgUpdateFdt (

>      if (EFI_ERROR (Status)) {

>        goto Fdt_Exit;

>      }

> +

> +    Status = gBS->InstallConfigurationTable (

> +                    &gFdtTableGuid,

> +                    (VOID *)(UINTN)NewFdtBase

> +                    );

>    }

>

> -  Status = gBS->InstallConfigurationTable (

> -                  &gFdtTableGuid,

> -                  (VOID *)(UINTN)NewFdtBase

> -                  );

>    if (!EFI_ERROR (Status)) {

>      return EFI_SUCCESS;

>    }

> --

> 2.11.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm Dec. 6, 2017, 9:41 p.m. | #2
On Wed, Dec 06, 2017 at 08:36:48PM +0000, Ard Biesheuvel wrote:
> On 6 December 2017 at 20:31, Leif Lindholm <leif.lindholm@linaro.org> wrote:

> > Address an incorrect function prototype (using ; instead of ,)

> > in AndroidBootImg.h.

> >

> > Also restructure code slightly to avoid a "may be used uninitialized"

> > warning.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> 

> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Thanks!
Pushed as ac811846f2.

> > ---

> >  EmbeddedPkg/Include/Protocol/AndroidBootImg.h             | 4 ++--

> >  EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c | 9 +++++----

> >  2 files changed, 7 insertions(+), 6 deletions(-)

> >

> > diff --git a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h

> > index 1c458d0255..cd3c42e858 100644

> > --- a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h

> > +++ b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h

> > @@ -33,8 +33,8 @@ EFI_STATUS

> >  typedef

> >  EFI_STATUS

> >  (EFIAPI *ANDROID_BOOTIMG_UPDATE_DTB) (

> > -  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase;

> > -  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase;

> > +  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase,

> > +  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase

> >    );

> >

> >  struct _ANDROID_BOOTIMG_PROTOCOL {

> > diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

> > index 09c4d924f1..2e50cedf6a 100644

> > --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

> > +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c

> > @@ -357,12 +357,13 @@ AndroidBootImgUpdateFdt (

> >      if (EFI_ERROR (Status)) {

> >        goto Fdt_Exit;

> >      }

> > +

> > +    Status = gBS->InstallConfigurationTable (

> > +                    &gFdtTableGuid,

> > +                    (VOID *)(UINTN)NewFdtBase

> > +                    );

> >    }

> >

> > -  Status = gBS->InstallConfigurationTable (

> > -                  &gFdtTableGuid,

> > -                  (VOID *)(UINTN)NewFdtBase

> > -                  );

> >    if (!EFI_ERROR (Status)) {

> >      return EFI_SUCCESS;

> >    }

> > --

> > 2.11.0

> >

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h
index 1c458d0255..cd3c42e858 100644
--- a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h
+++ b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h
@@ -33,8 +33,8 @@  EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *ANDROID_BOOTIMG_UPDATE_DTB) (
-  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase;
-  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase;
+  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase,
+  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase
   );
 
 struct _ANDROID_BOOTIMG_PROTOCOL {
diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
index 09c4d924f1..2e50cedf6a 100644
--- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
+++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
@@ -357,12 +357,13 @@  AndroidBootImgUpdateFdt (
     if (EFI_ERROR (Status)) {
       goto Fdt_Exit;
     }
+
+    Status = gBS->InstallConfigurationTable (
+                    &gFdtTableGuid,
+                    (VOID *)(UINTN)NewFdtBase
+                    );
   }
 
-  Status = gBS->InstallConfigurationTable (
-                  &gFdtTableGuid,
-                  (VOID *)(UINTN)NewFdtBase
-                  );
   if (!EFI_ERROR (Status)) {
     return EFI_SUCCESS;
   }