On Wed, 4 Mar 2020 at 17:58, Laszlo Ersek <ler...@redhat.com> wrote:
>
> On 03/04/20 12:49, Ard Biesheuvel wrote:
> > The Linaro CI reports:
> >
> >
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:132:7:
> > error: variable 'Status' is used uninitialized whenever 'if' condition is
> > false [-Werror,-Wsometimes-uninitialized]
> > if (mInitrdLoadFile2Handle != NULL) {
> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:141:10:
> > note: uninitialized use occurs here
> > return Status;
> > ^~~~~~
> >
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:132:3:
> > note: remove the 'if' if its condition is always true
> > if (mInitrdLoadFile2Handle != NULL) {
> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:130:23:
> > note: initialize the variable 'Status' to silence this warning
> > EFI_STATUS Status;
> > ^
> > = 0
> >
> > Fix this by pulling the return of Status into the conditional block where
> > it is assigned, and return EFI_SUCCESS otherwise.
> >
> > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> > ---
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c |
> > 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git
> > a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c
> > b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c
> > index ed8fbaa77069..021b072826a9 100644
> > ---
> > a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c
> > +++
> > b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c
> > @@ -137,8 +137,9 @@ UninstallLoadFile2Protocol (
> > if (!EFI_ERROR (Status)) {
> > mInitrdLoadFile2Handle = NULL;
> > }
> > + return Status;
> > }
> > - return Status;
> > + return EFI_SUCCESS;
> > }
> >
> > STATIC
> >
>
> I should have caught this in review. :/
>
> Please add the following to the commit message:
>
> Fixes: 2632178bc683f1f28f9dbe269f85d6b26b1800de
> Reviewed-by: Laszlo Ersek <ler...@redhat.com>
>
Pushed as 6c6fef024718578596a3554e6d287a89aa49b950
Thanks.
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55422): https://edk2.groups.io/g/devel/message/55422
Mute This Topic: https://groups.io/mt/71724202/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
