ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17 +++++++++++++---- .../UefiShellDebug1CommandsLib.uni | 1 + 2 files changed, 14 insertions(+), 4 deletions(-)
From: Huajing Li <huajing.li@intel.com>
Change "dmpstore" to show name of known variable vendor GUID.
The name is got from ShellProtocol.GetGuidName().
Cc: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
---
ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17 +++++++++++++----
.../UefiShellDebug1CommandsLib.uni | 1 +
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index aeffc89b19..062ab5dc3a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -424,6 +424,7 @@ CascadeProcessVariables (
CHAR16 *AttrString;
CHAR16 *HexString;
EFI_STATUS SetStatus;
+ CHAR16 *GuidName;
if (ShellGetExecutionBreakFlag()) {
return (SHELL_ABORTED);
@@ -521,10 +522,18 @@ CascadeProcessVariables (
Status = EFI_OUT_OF_RESOURCES;
}
} else {
- ShellPrintHiiEx (
- -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), gShellDebug1HiiHandle,
- AttrString, &FoundVarGuid, FoundVarName, DataSize
- );
+ Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid, &GuidName);
+ if (EFI_ERROR (Status)) {
+ ShellPrintHiiEx (
+ -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), gShellDebug1HiiHandle,
+ AttrString, &FoundVarGuid, FoundVarName, DataSize
+ );
+ } else {
+ ShellPrintHiiEx (
+ -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE2), gShellDebug1HiiHandle,
+ AttrString, GuidName, FoundVarName, DataSize
+ );
+ }
DumpHex (2, 0, DataSize, DataBuffer);
}
SHELL_FREE_NON_NULL (AttrString);
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index f733a67f0b..b6a133a454 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -385,6 +385,7 @@
#string STR_DMPSTORE_LOAD_GEN_FAIL #language en-US "%H%s%N: Failed to set variable %H%s%N: %r.\r\n"
#string STR_DMPSTORE_LOAD_BAD_FILE #language en-US "%H%s%N: Incorrect file format.\r\n"
#string STR_DMPSTORE_HEADER_LINE #language en-US "Variable %H%s%N '%H%g%N:%H%s%N' DataSize = 0x%02x\r\n"
+#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable %H%s%N '%H%s%N:%H%s%N' DataSize = 0x%02x\r\n"
#string STR_DMPSTORE_DELETE_LINE #language en-US "Delete variable '%H%g%N:%H%s%N': %r\r\n"
#string STR_DMPSTORE_NO_VAR_FOUND #language en-US "%H%s%N: No matching variables found.\r\n"
#string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n"
--
2.12.2.windows.2
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Whats the difference between HEADER_LINE and HEADER_LINE2? They look the same to me...
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Sunday, September 17, 2017 11:42 PM
> To: edk2-devel@lists.01.org
> Cc: Li, Huajing <huajing.li@intel.com>; Carsey, Jaben
> <jaben.carsey@intel.com>
> Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor
> GUID
> Importance: High
>
> From: Huajing Li <huajing.li@intel.com>
>
> Change "dmpstore" to show name of known variable vendor GUID.
> The name is got from ShellProtocol.GetGuidName().
>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Huajing Li <huajing.li@intel.com>
> ---
> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17
> +++++++++++++----
> .../UefiShellDebug1CommandsLib.uni | 1 +
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> index aeffc89b19..062ab5dc3a 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> @@ -424,6 +424,7 @@ CascadeProcessVariables (
> CHAR16 *AttrString;
> CHAR16 *HexString;
> EFI_STATUS SetStatus;
> + CHAR16 *GuidName;
>
> if (ShellGetExecutionBreakFlag()) {
> return (SHELL_ABORTED);
> @@ -521,10 +522,18 @@ CascadeProcessVariables (
> Status = EFI_OUT_OF_RESOURCES;
> }
> } else {
> - ShellPrintHiiEx (
> - -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE),
> gShellDebug1HiiHandle,
> - AttrString, &FoundVarGuid, FoundVarName, DataSize
> - );
> + Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid,
> &GuidName);
> + if (EFI_ERROR (Status)) {
> + ShellPrintHiiEx (
> + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE),
> gShellDebug1HiiHandle,
> + AttrString, &FoundVarGuid, FoundVarName, DataSize
> + );
> + } else {
> + ShellPrintHiiEx (
> + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE2),
> gShellDebug1HiiHandle,
> + AttrString, GuidName, FoundVarName, DataSize
> + );
> + }
> DumpHex (2, 0, DataSize, DataBuffer);
> }
> SHELL_FREE_NON_NULL (AttrString);
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.uni
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.uni
> index f733a67f0b..b6a133a454 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.uni
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.uni
> @@ -385,6 +385,7 @@
> #string STR_DMPSTORE_LOAD_GEN_FAIL #language en-US "%H%s%N:
> Failed to set variable %H%s%N: %r.\r\n"
> #string STR_DMPSTORE_LOAD_BAD_FILE #language en-US "%H%s%N:
> Incorrect file format.\r\n"
> #string STR_DMPSTORE_HEADER_LINE #language en-US "Variable
> %H%s%N '%H%g%N:%H%s%N' DataSize = 0x%02x\r\n"
> +#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable
> %H%s%N '%H%s%N:%H%s%N' DataSize = 0x%02x\r\n"
> #string STR_DMPSTORE_DELETE_LINE #language en-US "Delete variable
> '%H%g%N:%H%s%N': %r\r\n"
> #string STR_DMPSTORE_NO_VAR_FOUND #language en-US "%H%s%N:
> No matching variables found.\r\n"
> #string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US
> "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n"
> --
> 2.12.2.windows.2
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
"Variable %H%s%N '%H%****g****%N:%H%s%N' DataSize = 0x%02x\r\n"
"Variable %H%s%N '%H%****s****%N:%H%s%N' DataSize = 0x%02x\r\n"
HEADER_LINE dumps the GUID in hex format, using %g.
HEADER_LINE2 dumps the GUID name, using %s.
Thanks/Ray
> -----Original Message-----
> From: Carsey, Jaben
> Sent: Monday, September 18, 2017 11:24 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Cc: Li, Huajing <huajing.li@intel.com>
> Subject: RE: [PATCH] ShellPkg/dmpstore: Show name of known variable
> vendor GUID
>
> Whats the difference between HEADER_LINE and HEADER_LINE2? They look
> the same to me...
>
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Sunday, September 17, 2017 11:42 PM
> > To: edk2-devel@lists.01.org
> > Cc: Li, Huajing <huajing.li@intel.com>; Carsey, Jaben
> > <jaben.carsey@intel.com>
> > Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable
> vendor
> > GUID
> > Importance: High
> >
> > From: Huajing Li <huajing.li@intel.com>
> >
> > Change "dmpstore" to show name of known variable vendor GUID.
> > The name is got from ShellProtocol.GetGuidName().
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Huajing Li <huajing.li@intel.com>
> > ---
> > ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17
> > +++++++++++++----
> > .../UefiShellDebug1CommandsLib.uni | 1 +
> > 2 files changed, 14 insertions(+), 4 deletions(-)
> >
> > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > index aeffc89b19..062ab5dc3a 100644
> > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > @@ -424,6 +424,7 @@ CascadeProcessVariables (
> > CHAR16 *AttrString;
> > CHAR16 *HexString;
> > EFI_STATUS SetStatus;
> > + CHAR16 *GuidName;
> >
> > if (ShellGetExecutionBreakFlag()) {
> > return (SHELL_ABORTED);
> > @@ -521,10 +522,18 @@ CascadeProcessVariables (
> > Status = EFI_OUT_OF_RESOURCES;
> > }
> > } else {
> > - ShellPrintHiiEx (
> > - -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE),
> > gShellDebug1HiiHandle,
> > - AttrString, &FoundVarGuid, FoundVarName, DataSize
> > - );
> > + Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid,
> > &GuidName);
> > + if (EFI_ERROR (Status)) {
> > + ShellPrintHiiEx (
> > + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE),
> > gShellDebug1HiiHandle,
> > + AttrString, &FoundVarGuid, FoundVarName, DataSize
> > + );
> > + } else {
> > + ShellPrintHiiEx (
> > + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE2),
> > gShellDebug1HiiHandle,
> > + AttrString, GuidName, FoundVarName, DataSize
> > + );
> > + }
> > DumpHex (2, 0, DataSize, DataBuffer);
> > }
> > SHELL_FREE_NON_NULL (AttrString); diff --git
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > dsLib.uni
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > dsLib.uni
> > index f733a67f0b..b6a133a454 100644
> > ---
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > dsLib.uni
> > +++
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > dsLib.uni
> > @@ -385,6 +385,7 @@
> > #string STR_DMPSTORE_LOAD_GEN_FAIL #language en-US "%H%s%N:
> > Failed to set variable %H%s%N: %r.\r\n"
> > #string STR_DMPSTORE_LOAD_BAD_FILE #language en-US "%H%s%N:
> > Incorrect file format.\r\n"
> > #string STR_DMPSTORE_HEADER_LINE #language en-US "Variable
> > %H%s%N '%H%g%N:%H%s%N' DataSize = 0x%02x\r\n"
> > +#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable
> > %H%s%N '%H%s%N:%H%s%N' DataSize = 0x%02x\r\n"
> > #string STR_DMPSTORE_DELETE_LINE #language en-US "Delete variable
> > '%H%g%N:%H%s%N': %r\r\n"
> > #string STR_DMPSTORE_NO_VAR_FOUND #language en-US "%H%s%N:
> > No matching variables found.\r\n"
> > #string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US
> > "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n"
> > --
> > 2.12.2.windows.2
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Wednesday, September 20, 2017 10:30 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; edk2-devel@lists.01.org
> Cc: Li, Huajing <huajing.li@intel.com>
> Subject: RE: [PATCH] ShellPkg/dmpstore: Show name of known variable
> vendor GUID
> Importance: High
>
> "Variable %H%s%N '%H%****g****%N:%H%s%N' DataSize = 0x%02x\r\n"
> "Variable %H%s%N '%H%****s****%N:%H%s%N' DataSize = 0x%02x\r\n"
>
> HEADER_LINE dumps the GUID in hex format, using %g.
> HEADER_LINE2 dumps the GUID name, using %s.
>
> Thanks/Ray
>
> > -----Original Message-----
> > From: Carsey, Jaben
> > Sent: Monday, September 18, 2017 11:24 PM
> > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > Cc: Li, Huajing <huajing.li@intel.com>
> > Subject: RE: [PATCH] ShellPkg/dmpstore: Show name of known variable
> > vendor GUID
> >
> > Whats the difference between HEADER_LINE and HEADER_LINE2? They
> look
> > the same to me...
> >
> > > -----Original Message-----
> > > From: Ni, Ruiyu
> > > Sent: Sunday, September 17, 2017 11:42 PM
> > > To: edk2-devel@lists.01.org
> > > Cc: Li, Huajing <huajing.li@intel.com>; Carsey, Jaben
> > > <jaben.carsey@intel.com>
> > > Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable
> > vendor
> > > GUID
> > > Importance: High
> > >
> > > From: Huajing Li <huajing.li@intel.com>
> > >
> > > Change "dmpstore" to show name of known variable vendor GUID.
> > > The name is got from ShellProtocol.GetGuidName().
> > >
> > > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > Signed-off-by: Huajing Li <huajing.li@intel.com>
> > > ---
> > > ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17
> > > +++++++++++++----
> > > .../UefiShellDebug1CommandsLib.uni | 1 +
> > > 2 files changed, 14 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > > b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > > index aeffc89b19..062ab5dc3a 100644
> > > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> > > @@ -424,6 +424,7 @@ CascadeProcessVariables (
> > > CHAR16 *AttrString;
> > > CHAR16 *HexString;
> > > EFI_STATUS SetStatus;
> > > + CHAR16 *GuidName;
> > >
> > > if (ShellGetExecutionBreakFlag()) {
> > > return (SHELL_ABORTED);
> > > @@ -521,10 +522,18 @@ CascadeProcessVariables (
> > > Status = EFI_OUT_OF_RESOURCES;
> > > }
> > > } else {
> > > - ShellPrintHiiEx (
> > > - -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE),
> > > gShellDebug1HiiHandle,
> > > - AttrString, &FoundVarGuid, FoundVarName, DataSize
> > > - );
> > > + Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid,
> > > &GuidName);
> > > + if (EFI_ERROR (Status)) {
> > > + ShellPrintHiiEx (
> > > + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE),
> > > gShellDebug1HiiHandle,
> > > + AttrString, &FoundVarGuid, FoundVarName, DataSize
> > > + );
> > > + } else {
> > > + ShellPrintHiiEx (
> > > + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE2),
> > > gShellDebug1HiiHandle,
> > > + AttrString, GuidName, FoundVarName, DataSize
> > > + );
> > > + }
> > > DumpHex (2, 0, DataSize, DataBuffer);
> > > }
> > > SHELL_FREE_NON_NULL (AttrString); diff --git
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > > dsLib.uni
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > > dsLib.uni
> > > index f733a67f0b..b6a133a454 100644
> > > ---
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > > dsLib.uni
> > > +++
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> > > dsLib.uni
> > > @@ -385,6 +385,7 @@
> > > #string STR_DMPSTORE_LOAD_GEN_FAIL #language en-US "%H%s%N:
> > > Failed to set variable %H%s%N: %r.\r\n"
> > > #string STR_DMPSTORE_LOAD_BAD_FILE #language en-US "%H%s%N:
> > > Incorrect file format.\r\n"
> > > #string STR_DMPSTORE_HEADER_LINE #language en-US "Variable
> > > %H%s%N '%H%g%N:%H%s%N' DataSize = 0x%02x\r\n"
> > > +#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable
> > > %H%s%N '%H%s%N:%H%s%N' DataSize = 0x%02x\r\n"
> > > #string STR_DMPSTORE_DELETE_LINE #language en-US "Delete
> variable
> > > '%H%g%N:%H%s%N': %r\r\n"
> > > #string STR_DMPSTORE_NO_VAR_FOUND #language en-US
> "%H%s%N:
> > > No matching variables found.\r\n"
> > > #string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US
> > > "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n"
> > > --
> > > 2.12.2.windows.2
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Hi,
this patch breaks the GCC48 build:
On 09/18/17 08:42, Ruiyu Ni wrote:
> From: Huajing Li <huajing.li@intel.com>
>
> Change "dmpstore" to show name of known variable vendor GUID.
> The name is got from ShellProtocol.GetGuidName().
>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Huajing Li <huajing.li@intel.com>
> ---
> ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17 +++++++++++++----
> .../UefiShellDebug1CommandsLib.uni | 1 +
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> index aeffc89b19..062ab5dc3a 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> @@ -424,6 +424,7 @@ CascadeProcessVariables (
> CHAR16 *AttrString;
> CHAR16 *HexString;
> EFI_STATUS SetStatus;
> + CHAR16 *GuidName;
>
> if (ShellGetExecutionBreakFlag()) {
> return (SHELL_ABORTED);
> @@ -521,10 +522,18 @@ CascadeProcessVariables (
> Status = EFI_OUT_OF_RESOURCES;
> }
> } else {
> - ShellPrintHiiEx (
> - -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), gShellDebug1HiiHandle,
> - AttrString, &FoundVarGuid, FoundVarName, DataSize
> - );
> + Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid, &GuidName);
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 **}'
It was reported by Gerd's Jenkins CI.
Thanks
Laszlo
> + if (EFI_ERROR (Status)) {
> + ShellPrintHiiEx (
> + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), gShellDebug1HiiHandle,
> + AttrString, &FoundVarGuid, FoundVarName, DataSize
> + );
> + } else {
> + ShellPrintHiiEx (
> + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE2), gShellDebug1HiiHandle,
> + AttrString, GuidName, FoundVarName, DataSize
> + );
> + }
> DumpHex (2, 0, DataSize, DataBuffer);
> }
> SHELL_FREE_NON_NULL (AttrString);
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
> index f733a67f0b..b6a133a454 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
> @@ -385,6 +385,7 @@
> #string STR_DMPSTORE_LOAD_GEN_FAIL #language en-US "%H%s%N: Failed to set variable %H%s%N: %r.\r\n"
> #string STR_DMPSTORE_LOAD_BAD_FILE #language en-US "%H%s%N: Incorrect file format.\r\n"
> #string STR_DMPSTORE_HEADER_LINE #language en-US "Variable %H%s%N '%H%g%N:%H%s%N' DataSize = 0x%02x\r\n"
> +#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable %H%s%N '%H%s%N:%H%s%N' DataSize = 0x%02x\r\n"
> #string STR_DMPSTORE_DELETE_LINE #language en-US "Delete variable '%H%g%N:%H%s%N': %r\r\n"
> #string STR_DMPSTORE_NO_VAR_FOUND #language en-US "%H%s%N: No matching variables found.\r\n"
> #string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n"
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.