1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure

Laszlo Ersek posted 1 patch 7 years, 3 months ago
Failed in applying to current master (apply log)
ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2] [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
Posted by Laszlo Ersek 7 years, 3 months ago 
> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66: error:
> passing argument 2 of 'gEfiShellProtocol->GetGuidName' from incompatible
> pointer type [-Werror=incompatible-pointer-types]
>
>       Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid, &GuidName);
>                                                              ^
> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66: note:
> expected 'const CHAR16 ** {aka const short unsigned int **}' but
> argument is of type 'CHAR16 ** {aka short unsigned int **}'

Pointer-to-(pointer-to-CHAR16) and pointer-to-(pointer-to-const-CHAR16)
are incompatible types; GCC and CLANG are right to complain.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Reported-by: Jenkins Build Host <jenkins@kraxel.org>
Reported-by: Steven Shi <steven.shi@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=716
Fixes: 09e8678380aaaf0a5ef59179ff59e0a045d1b0bf
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    I'm going to push this as soon as I get an R-b from anyone.
    
    Thanks
    Laszlo

 ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index 062ab5dc3a9a..5791da9acc8c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -424,7 +424,7 @@ CascadeProcessVariables (
   CHAR16                    *AttrString;
   CHAR16                    *HexString;
   EFI_STATUS                SetStatus;
-  CHAR16                    *GuidName;
+  CONST CHAR16              *GuidName;
 
   if (ShellGetExecutionBreakFlag()) {
     return (SHELL_ABORTED);
-- 
2.14.1.3.gb7cf6e02401b

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
Posted by Ard Biesheuvel 7 years, 3 months ago 

On 22 Sep 2017, at 06:34, Laszlo Ersek <lersek@redhat.com> wrote:

>> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66: error:
>> passing argument 2 of 'gEfiShellProtocol->GetGuidName' from incompatible
>> pointer type [-Werror=incompatible-pointer-types]
>> 
>>      Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid, &GuidName);
>>                                                             ^
>> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66: note:
>> expected 'const CHAR16 ** {aka const short unsigned int **}' but
>> argument is of type 'CHAR16 ** {aka short unsigned int **}'
> 
> Pointer-to-(pointer-to-CHAR16) and pointer-to-(pointer-to-const-CHAR16)
> are incompatible types; GCC and CLANG are right to complain.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Steven Shi <steven.shi@intel.com>
> Reported-by: Jenkins Build Host <jenkins@kraxel.org>
> Reported-by: Steven Shi <steven.shi@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=716
> Fixes: 09e8678380aaaf0a5ef59179ff59e0a045d1b0bf
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>    I'm going to push this as soon as I get an R-b from anyone.
> 

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

>    Thanks
>    Laszlo
> 
> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> index 062ab5dc3a9a..5791da9acc8c 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> @@ -424,7 +424,7 @@ CascadeProcessVariables (
>   CHAR16                    *AttrString;
>   CHAR16                    *HexString;
>   EFI_STATUS                SetStatus;
> -  CHAR16                    *GuidName;
> +  CONST CHAR16              *GuidName;
> 
>   if (ShellGetExecutionBreakFlag()) {
>     return (SHELL_ABORTED);
> -- 
> 2.14.1.3.gb7cf6e02401b
> 
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
Posted by Carsey, Jaben 7 years, 3 months ago 
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Friday, September 22, 2017 6:44 AM
> To: Laszlo Ersek <lersek@redhat.com>
> Cc: edk2-devel@lists.01.org; Carsey, Jaben <jaben.carsey@intel.com>; Ni,
> Ruiyu <ruiyu.ni@intel.com>; Shi, Steven <steven.shi@intel.com>
> Subject: Re: [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
> Importance: High
> 
> 
> 
> On 22 Sep 2017, at 06:34, Laszlo Ersek <lersek@redhat.com> wrote:
> 
> >> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66:
> error:
> >> passing argument 2 of 'gEfiShellProtocol->GetGuidName' from
> incompatible
> >> pointer type [-Werror=incompatible-pointer-types]
> >>
> >>      Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid,
> &GuidName);
> >>                                                             ^
> >> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66:
> note:
> >> expected 'const CHAR16 ** {aka const short unsigned int **}' but
> >> argument is of type 'CHAR16 ** {aka short unsigned int **}'
> >
> > Pointer-to-(pointer-to-CHAR16) and pointer-to-(pointer-to-const-CHAR16)
> > are incompatible types; GCC and CLANG are right to complain.
> >
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> > Cc: Steven Shi <steven.shi@intel.com>
> > Reported-by: Jenkins Build Host <jenkins@kraxel.org>
> > Reported-by: Steven Shi <steven.shi@intel.com>
> > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=716
> > Fixes: 09e8678380aaaf0a5ef59179ff59e0a045d1b0bf
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> > ---
> >
> > Notes:
> >    I'm going to push this as soon as I get an R-b from anyone.
> >
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> >    Thanks
> >    Laszlo
> >
> > ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > index 062ab5dc3a9a..5791da9acc8c 100644
> > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > @@ -424,7 +424,7 @@ CascadeProcessVariables (
> >   CHAR16                    *AttrString;
> >   CHAR16                    *HexString;
> >   EFI_STATUS                SetStatus;
> > -  CHAR16                    *GuidName;
> > +  CONST CHAR16              *GuidName;
> >
> >   if (ShellGetExecutionBreakFlag()) {
> >     return (SHELL_ABORTED);
> > --
> > 2.14.1.3.gb7cf6e02401b
> >
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
Posted by Laszlo Ersek 7 years, 3 months ago 
On 09/22/17 16:00, Carsey, Jaben wrote:
> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

Thank you both; pushed as commit ba30d5f05121.
Laszlo

>> -----Original Message-----
>> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
>> Sent: Friday, September 22, 2017 6:44 AM
>> To: Laszlo Ersek <lersek@redhat.com>
>> Cc: edk2-devel@lists.01.org; Carsey, Jaben <jaben.carsey@intel.com>; Ni,
>> Ruiyu <ruiyu.ni@intel.com>; Shi, Steven <steven.shi@intel.com>
>> Subject: Re: [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
>> Importance: High
>>
>>
>>
>> On 22 Sep 2017, at 06:34, Laszlo Ersek <lersek@redhat.com> wrote:
>>
>>>> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66:
>> error:
>>>> passing argument 2 of 'gEfiShellProtocol->GetGuidName' from
>> incompatible
>>>> pointer type [-Werror=incompatible-pointer-types]
>>>>
>>>>      Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid,
>> &GuidName);
>>>>                                                             ^
>>>> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66:
>> note:
>>>> expected 'const CHAR16 ** {aka const short unsigned int **}' but
>>>> argument is of type 'CHAR16 ** {aka short unsigned int **}'
>>>
>>> Pointer-to-(pointer-to-CHAR16) and pointer-to-(pointer-to-const-CHAR16)
>>> are incompatible types; GCC and CLANG are right to complain.
>>>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>> Cc: Jaben Carsey <jaben.carsey@intel.com>
>>> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
>>> Cc: Steven Shi <steven.shi@intel.com>
>>> Reported-by: Jenkins Build Host <jenkins@kraxel.org>
>>> Reported-by: Steven Shi <steven.shi@intel.com>
>>> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=716
>>> Fixes: 09e8678380aaaf0a5ef59179ff59e0a045d1b0bf
>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>> ---
>>>
>>> Notes:
>>>    I'm going to push this as soon as I get an R-b from anyone.
>>>
>>
>> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>
>>>    Thanks
>>>    Laszlo
>>>
>>> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
>> b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
>>> index 062ab5dc3a9a..5791da9acc8c 100644
>>> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
>>> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
>>> @@ -424,7 +424,7 @@ CascadeProcessVariables (
>>>   CHAR16                    *AttrString;
>>>   CHAR16                    *HexString;
>>>   EFI_STATUS                SetStatus;
>>> -  CHAR16                    *GuidName;
>>> +  CONST CHAR16              *GuidName;
>>>
>>>   if (ShellGetExecutionBreakFlag()) {
>>>     return (SHELL_ABORTED);
>>> --
>>> 2.14.1.3.gb7cf6e02401b
>>>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
Posted by Ni, Ruiyu 7 years, 3 months ago 
Sorry about the failure and thank you all for the quick fix.

Sent from a small-screen device

在 2017年9月22日，下午10:53，Laszlo Ersek <lersek@redhat.com<mailto:lersek@redhat.com>> 写道：

On 09/22/17 16:00, Carsey, Jaben wrote:
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com<mailto:jaben.carsey@intel.com>>

Thank you both; pushed as commit ba30d5f05121.
Laszlo

-----Original Message-----
From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
Sent: Friday, September 22, 2017 6:44 AM
To: Laszlo Ersek <lersek@redhat.com<mailto:lersek@redhat.com>>
Cc: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>; Carsey, Jaben <jaben.carsey@intel.com<mailto:jaben.carsey@intel.com>>; Ni,
Ruiyu <ruiyu.ni@intel.com<mailto:ruiyu.ni@intel.com>>; Shi, Steven <steven.shi@intel.com<mailto:steven.shi@intel.com>>
Subject: Re: [PATCH] ShellPkg/DmpStore: fix GCC/CLANG build failure
Importance: High



On 22 Sep 2017, at 06:34, Laszlo Ersek <lersek@redhat.com<mailto:lersek@redhat.com>> wrote:

ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66:
error:
passing argument 2 of 'gEfiShellProtocol->GetGuidName' from
incompatible
pointer type [-Werror=incompatible-pointer-types]

    Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid,
&GuidName);
                                                           ^
ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66:
note:
expected 'const CHAR16 ** {aka const short unsigned int **}' but
argument is of type 'CHAR16 ** {aka short unsigned int **}'

Pointer-to-(pointer-to-CHAR16) and pointer-to-(pointer-to-const-CHAR16)
are incompatible types; GCC and CLANG are right to complain.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org<mailto:ard.biesheuvel@linaro.org>>
Cc: Jaben Carsey <jaben.carsey@intel.com<mailto:jaben.carsey@intel.com>>
Cc: Ruiyu Ni <ruiyu.ni@intel.com<mailto:ruiyu.ni@intel.com>>
Cc: Steven Shi <steven.shi@intel.com<mailto:steven.shi@intel.com>>
Reported-by: Jenkins Build Host <jenkins@kraxel.org<mailto:jenkins@kraxel.org>>
Reported-by: Steven Shi <steven.shi@intel.com<mailto:steven.shi@intel.com>>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=716
Fixes: 09e8678380aaaf0a5ef59179ff59e0a045d1b0bf
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com<mailto:lersek@redhat.com>>
---

Notes:
  I'm going to push this as soon as I get an R-b from anyone.


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

  Thanks
  Laszlo

ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index 062ab5dc3a9a..5791da9acc8c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -424,7 +424,7 @@ CascadeProcessVariables (
 CHAR16                    *AttrString;
 CHAR16                    *HexString;
 EFI_STATUS                SetStatus;
-  CHAR16                    *GuidName;
+  CONST CHAR16              *GuidName;

 if (ShellGetExecutionBreakFlag()) {
   return (SHELL_ABORTED);
--
2.14.1.3.gb7cf6e02401b

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


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

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.