Tianocore/edk2.git/ShellPkg/Library, branch edk2_master

ShellPkg/AcpiView: Fix unused variable warnings in RimtParser

2025-12-04T08:43:02+00:00

Clang complains about unused variables: ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rimt/RimtParser.c:21:60: error: variable 'mRimtNodeHeader' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] 21 | STATIC EFI_ACPI_6_6_RIMT_NODE_HEADER_STRUCTURE mRimtNodeHeader; | ^~~~~~~~~~~~~~~ ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rimt/RimtParser.c:25:60: error: variable 'mRimtIdMappingNode' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] 25 | STATIC EFI_ACPI_6_6_RIMT_ID_MAPPING_STRUCTURE mRimtIdMappingNode; | ^~~~~~~~~~~~~~~~~~ 28 | STATIC EFI_ACPI_6_6_RIMT_PCIE_ROOT_COMPLEX_NODE_STRUCTURE mRimtPcieRootComplexNode; | ^~~~~~~~~~~~~~~~~~~~~~~~ ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rimt/RimtParser.c:29:60: error: variable 'mRimtIommuNode' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] 29 | STATIC EFI_ACPI_6_6_RIMT_IOMMU_NODE_STRUCTURE mRimtIommuNode; | ^~~~~~~~~~~~~~ 4 errors generated. This is because these variables are only used to take the size of their fields using the sizeof() operator, which does not support type names directly. So create a helper macro SIZE_OF_T () that provides the functionality we need, and drop the unused variables. Signed-off-by: Ard Biesheuvel

ShellPkg/For: Remove redundant null/empty checks on ArgSetWalker

2025-12-03T17:41:35+00:00

Fix CodeQL cpp/redundant-null-check-simple warning in ShellPkg/Library/UefiShellLevel1CommandsLib/For.c at line 571 by removing redundant null and empty-string checks on ArgSetWalker. The outer guard at line 570 ensures that ArgSetWalker is non-NULL and non-empty, so the inner condition only needs ShellIsValidForNumber(ArgSetWalker). Signed-off-by: Mingjie Shen

ShellPkg/Mv: Harden and optimize trailing-slash trimming

2025-12-03T17:41:35+00:00

- Remove redundant null check in IsValidMove() per CodeQL cpp/redundant-null-check-simple. Specifically, drop the "DestPathWalker != NULL" condition from the trimming loop. Rationale: "DestPathCopy" is allocated at line 181 and checked for NULL at lines 182–183; "DestPathWalker" is initialized from "DestPathCopy" at line 186, so it cannot be NULL. - Cache length once in IsValidMove() and ValidateAndMoveFiles() so the trimming loop avoids repeated StrLen() calls. - Guard the zero-length case before indexing the last character to prevent out-of-bounds access. Signed-off-by: Mingjie Shen

ShellPkg/UefiShellLevel2: Fix CodeQl issues

2025-12-02T08:00:53+00:00

Fix CodeQl issue triggered by the previous patches. - Rm: FileList might be NULL Signed-off-by: Pierre Gondois

ShellPkg/UefiShellLevel2/Ls: Remove ShellStatus check in MainCmdLs()

2025-12-02T08:00:53+00:00

Remove a check against ShellStatus in MainCmdLs() as there are two consecutive checks without any modification of ShellStatus. Suggested-by: Leif Lindholm Signed-off-by: Pierre Gondois

ShellPkg/UefiShellLevel2/Ls: Bail out early in MainCmdLs()

2025-12-02T08:00:53+00:00

If RootPath is NULL, PrintLsOutput() will return an error code of SHELL_OUT_OF_RESOURCES and not print anything: PrintLsOutput() \-StrnCatGrow() if (Source == NULL) { return (*Destination); } Remove paths where FullPath ends up being NULL and bail out early. Signed-off-by: Pierre Gondois

ShellPkg/UefiShellLevel2/Ls: Flatten MainCmdLs()

2025-12-02T08:00:53+00:00

Remove some of the success handling conditions to flatten the MainCmdLs() function. No functional change should be induced by this patch. Signed-off-by: Pierre Gondois

ShellPkg/UefiShellLevel2: Lower indentation level in MainCmdXXX()

2025-12-02T08:00:53+00:00

This patch aims to help breaking down the long function present in the ShellPkg and reduce complexity/nested code and conditions. Lower the indentation level in the newly created MainCmdXXX() functions. No functional change should be induced by this patch. Signed-off-by: Pierre Gondois

ShellPkg/UefiShellLevel2: Extract MainCmdXXX() function

2025-12-02T08:00:53+00:00

This patch aims to help breaking down the long function present in the ShellPkg and reduce complexity/nested code and conditions. Extract a MainCmdXXX() function for each shell command. This command contains the possible operations the command aims to operate. The ShellCommandRunXXX() function from which it is extracted is only responsible of: - initializing the shell/command environment - parsing the command parameter and creating a Package - freeing the Package No functional change should be induced by this patch. Signed-off-by: Pierre Gondois

ShellPkg/UefiShellLevel2: Return if ShellCommandLineParse() failed

2025-12-02T08:00:53+00:00

This patch aims to help breaking down the long function present in the ShellPkg and reduce complexity/nested code and conditions. Return directly if ShellCommandLineParse() returned an error Status. In such case, the "Package" that should be allocated by ShellCommandLineParse() is already freed in: ShellCommandLineParse() \-ShellCommandLineParseEx() \-InternalCommandLineParse() so there is no need to free it with ShellCommandLineFreeVarList(). Note: Cd: Return directly if ShellCommandLineParse() returned an error Status. The initial code was ignoring the error status. Cp: Only check for ShellGetExecutionBreakFlag() if ShellCommandLineParse() returned successfully. If the command line failed to be parsed, there should be no need to check for the execution break flag. No functional change should be induced by this patch. Signed-off-by: Pierre Gondois