Subject line should have a ShellPkg prefix.
ShellPkg: Use a local variable to cache the pointer.
On 2016-05-12 15:09:32, Jaben Carsey wrote:
> CC: Qiu Shumin <shumin....@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jaben Carsey <jaben.car...@intel.com>
> ---
> ShellPkg/Application/Shell/Shell.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/ShellPkg/Application/Shell/Shell.c
> b/ShellPkg/Application/Shell/Shell.c
> index b06c1ef..47b3118 100644
> --- a/ShellPkg/Application/Shell/Shell.c
> +++ b/ShellPkg/Application/Shell/Shell.c
> @@ -2499,6 +2499,7 @@ SetupAndRunCommandOrFile(
> SHELL_FILE_HANDLE OriginalStdOut;
> SHELL_FILE_HANDLE OriginalStdErr;
> SYSTEM_TABLE_INFO OriginalSystemTableInfo;
> + CONST SCRIPT_FILE *ConstScriptFile;
>
> //
> // Update the StdIn, StdOut, and StdErr for redirection to environment
> variables, files, etc... unicode and ASCII
> @@ -2518,10 +2519,11 @@ SetupAndRunCommandOrFile(
> // Now print errors
> //
> if (EFI_ERROR(Status)) {
> - if (ShellCommandGetCurrentScriptFile() == NULL ||
> ShellCommandGetCurrentScriptFile()->CurrentCommand == NULL) {
> + ConstScriptFile = ShellCommandGetCurrentScriptFile();
> + if (ConstScriptFile == NULL || ConstScriptFile->CurrentCommand == NULL) {
> ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR),
> ShellInfoObject.HiiHandle, (VOID*)(Status));
> } else {
> - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR_SCRIPT),
> ShellInfoObject.HiiHandle, (VOID*)(Status),
> ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);
> + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR_SCRIPT),
> ShellInfoObject.HiiHandle, (VOID*)(Status),
> ConstScriptFile->CurrentCommand->Line);
You should split this line to be < 80 columns. Also, there is the
dreaded 'space before open parens' code style...
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SHELL_ERROR_SCRIPT),
ShellInfoObject.HiiHandle, (VOID*)(Status),
ConstScriptFile->CurrentCommand->Line);
-Jordan
> }
> }
>
> --
> 2.7.2.windows.1
>
> _______________________________________________
> 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
