/** @file\r
Provides interface to advanced shell functionality for parsing both handle and protocol database.\r
\r
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
This program and the accompanying materials\r
\r
EFI_HANDLE mHandleParsingHiiHandle = NULL;\r
HANDLE_INDEX_LIST mHandleList = {{{NULL,NULL},0,0},0};\r
-GUID_INFO_BLOCK *GuidList;\r
-UINTN GuidListCount;\r
+GUID_INFO_BLOCK *mGuidList;\r
+UINTN mGuidListCount;\r
/**\r
Function to translate the EFI_MEMORY_TYPE into a string.\r
\r
@retval A string representation of the type allocated from BS Pool.\r
**/\r
CHAR16*\r
-EFIAPI\r
ConvertMemoryType (\r
IN CONST EFI_MEMORY_TYPE Memory\r
)\r
@retval A string representation of the type allocated from BS Pool.\r
**/\r
CHAR16*\r
-EFIAPI\r
ConvertPixelFormat (\r
IN CONST EFI_GRAPHICS_PIXEL_FORMAT Fmt\r
)\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- GuidListCount = 0;\r
- GuidList = NULL;\r
+ mGuidListCount = 0;\r
+ mGuidList = NULL;\r
\r
//\r
// Do nothing with mHandleParsingHiiHandle. Initialize HII as needed.\r
{\r
UINTN LoopCount;\r
\r
- for (LoopCount = 0; GuidList != NULL && LoopCount < GuidListCount; LoopCount++) {\r
- SHELL_FREE_NON_NULL(GuidList[LoopCount].GuidId);\r
+ for (LoopCount = 0; mGuidList != NULL && LoopCount < mGuidListCount; LoopCount++) {\r
+ SHELL_FREE_NON_NULL(mGuidList[LoopCount].GuidId);\r
}\r
\r
- SHELL_FREE_NON_NULL(GuidList);\r
+ SHELL_FREE_NON_NULL(mGuidList);\r
if (mHandleParsingHiiHandle != NULL) {\r
HiiRemovePackages(mHandleParsingHiiHandle);\r
}\r
ASSERT_EFI_ERROR(Status);\r
\r
RetVal = AllocateZeroPool(VersionStringSize);\r
- ASSERT(RetVal != NULL);\r
- UnicodeSPrint(RetVal, VersionStringSize, L"0x%08x", DriverEfiVersion->FirmwareVersion);\r
+ if (RetVal != NULL) {\r
+ UnicodeSPrint (RetVal, VersionStringSize, L"0x%08x", DriverEfiVersion->FirmwareVersion);\r
+ }\r
return (RetVal);\r
}\r
/**\r
TempStr,\r
Index,\r
ImageInfoV1[Index].ImageIndex,\r
- ImageInfoV1[Index].ImageTypeId,\r
+ &ImageInfoV1[Index].ImageTypeId,\r
ImageInfoV1[Index].ImageId,\r
ImageInfoV1[Index].ImageIdName,\r
ImageInfoV1[Index].Version,\r
TempStr,\r
Index,\r
ImageInfoV2[Index].ImageIndex,\r
- ImageInfoV2[Index].ImageTypeId,\r
+ &ImageInfoV2[Index].ImageTypeId,\r
ImageInfoV2[Index].ImageId,\r
ImageInfoV2[Index].ImageIdName,\r
ImageInfoV2[Index].Version,\r
TempStr,\r
Index,\r
ImageInfo[Index].ImageIndex,\r
- ImageInfo[Index].ImageTypeId,\r
+ &ImageInfo[Index].ImageTypeId,\r
ImageInfo[Index].ImageId,\r
ImageInfo[Index].ImageIdName,\r
ImageInfo[Index].Version,\r
@return The node.\r
**/\r
CONST GUID_INFO_BLOCK *\r
-EFIAPI\r
InternalShellGetNodeFromGuid(\r
IN CONST EFI_GUID* Guid\r
)\r
\r
ASSERT(Guid != NULL);\r
\r
- for (LoopCount = 0, ListWalker = GuidList; GuidList != NULL && LoopCount < GuidListCount; LoopCount++, ListWalker++) {\r
+ for (LoopCount = 0, ListWalker = mGuidList; mGuidList != NULL && LoopCount < mGuidListCount; LoopCount++, ListWalker++) {\r
if (CompareGuid(ListWalker->GuidId, Guid)) {\r
return (ListWalker);\r
}\r
@retval EFI_INVALID_PARAMETER Guid NameId was invalid\r
**/\r
EFI_STATUS\r
-EFIAPI\r
InsertNewGuidNameMapping(\r
IN CONST EFI_GUID *Guid,\r
IN CONST EFI_STRING_ID NameID,\r
ASSERT(Guid != NULL);\r
ASSERT(NameID != 0);\r
\r
- GuidList = ReallocatePool(GuidListCount * sizeof(GUID_INFO_BLOCK), GuidListCount+1 * sizeof(GUID_INFO_BLOCK), GuidList);\r
- if (GuidList == NULL) {\r
- GuidListCount = 0;\r
+ mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK), mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList);\r
+ if (mGuidList == NULL) {\r
+ mGuidListCount = 0;\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
- GuidListCount++;\r
+ mGuidListCount++;\r
\r
- GuidList[GuidListCount - 1].GuidId = AllocateCopyPool(sizeof(EFI_GUID), Guid);\r
- GuidList[GuidListCount - 1].StringId = NameID;\r
- GuidList[GuidListCount - 1].DumpInfo = DumpFunc;\r
+ mGuidList[mGuidListCount - 1].GuidId = AllocateCopyPool(sizeof(EFI_GUID), Guid);\r
+ mGuidList[mGuidListCount - 1].StringId = NameID;\r
+ mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;\r
\r
- if (GuidList[GuidListCount - 1].GuidId == NULL) {\r
+ if (mGuidList[mGuidListCount - 1].GuidId == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
\r
}\r
}\r
\r
- for (LoopCount = 0, ListWalker = GuidList; GuidList != NULL && LoopCount < GuidListCount; LoopCount++, ListWalker++) {\r
+ for (LoopCount = 0, ListWalker = mGuidList; mGuidList != NULL && LoopCount < mGuidListCount; LoopCount++, ListWalker++) {\r
String = HiiGetString(mHandleParsingHiiHandle, ListWalker->StringId, Lang);\r
if (Name != NULL && String != NULL && StringNoCaseCompare (&Name, &String) == 0) {\r
*Guid = ListWalker->GuidId;\r
@retval EFI_SUCCESS The operation was successful.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
InternalShellInitHandleList(\r
VOID\r
)\r
}\r
for (mHandleList.NextIndex = 1 ; mHandleList.NextIndex <= HandleCount ; mHandleList.NextIndex++){\r
ListWalker = AllocateZeroPool(sizeof(HANDLE_LIST));\r
- ASSERT(ListWalker != NULL);\r
- ListWalker->TheHandle = HandleBuffer[mHandleList.NextIndex-1];\r
- ListWalker->TheIndex = mHandleList.NextIndex;\r
- InsertTailList(&mHandleList.List.Link,&ListWalker->Link);\r
+ if (ListWalker != NULL) {\r
+ ListWalker->TheHandle = HandleBuffer[mHandleList.NextIndex - 1];\r
+ ListWalker->TheIndex = mHandleList.NextIndex;\r
+ InsertTailList (&mHandleList.List.Link, &ListWalker->Link);\r
+ }\r
}\r
FreePool(HandleBuffer);\r
return (EFI_SUCCESS);\r
FreePool (ProtocolBuffer);\r
\r
ListWalker = AllocateZeroPool(sizeof(HANDLE_LIST));\r
- ASSERT(ListWalker != NULL);\r
+ if (ListWalker == NULL) {\r
+ return 0;\r
+ }\r
ListWalker->TheHandle = TheHandle;\r
ListWalker->TheIndex = mHandleList.NextIndex++;\r
InsertTailList(&mHandleList.List.Link,&ListWalker->Link);\r
}\r
\r
*HandleType = AllocateZeroPool (*HandleCount * sizeof (UINTN));\r
- ASSERT(*HandleType != NULL);\r
+ if (*HandleType == NULL) {\r
+ SHELL_FREE_NON_NULL (*HandleBuffer);\r
+ *HandleCount = 0;\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
DriverBindingHandleIndex = -1;\r
for (HandleIndex = 0; HandleIndex < *HandleCount; HandleIndex++) {\r
// Allocate a handle buffer for the number of handles that matched the attributes in Mask\r
//\r
*MatchingHandleBuffer = AllocateZeroPool ((*MatchingHandleCount +1)* sizeof (EFI_HANDLE));\r
- ASSERT(*MatchingHandleBuffer != NULL);\r
+ if (*MatchingHandleBuffer == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ } else {\r
+ for (HandleIndex = 0, *MatchingHandleCount = 0\r
+ ; HandleIndex < HandleCount\r
+ ; HandleIndex++\r
+ ) {\r
+ //\r
+ // Fill the allocated buffer with the handles that matched the attributes in Mask\r
+ //\r
+ if ((HandleType[HandleIndex] & Mask) == Mask) {\r
+ (*MatchingHandleBuffer)[(*MatchingHandleCount)++] = HandleBuffer[HandleIndex];\r
+ }\r
+ }\r
\r
- for (HandleIndex = 0,*MatchingHandleCount = 0\r
- ; HandleIndex < HandleCount\r
- ; HandleIndex++\r
- ){\r
//\r
- // Fill the allocated buffer with the handles that matched the attributes in Mask\r
+ // Make the last one NULL\r
//\r
- if ((HandleType[HandleIndex] & Mask) == Mask) {\r
- (*MatchingHandleBuffer)[(*MatchingHandleCount)++] = HandleBuffer[HandleIndex];\r
- }\r
- }\r
-\r
- //\r
- // Make the last one NULL\r
- //\r
- (*MatchingHandleBuffer)[*MatchingHandleCount] = NULL;\r
+ (*MatchingHandleBuffer)[*MatchingHandleCount] = NULL;\r
\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ } // *MatchingHandleBuffer == NULL (ELSE)\r
} // MacthingHandleBuffer == NULL (ELSE)\r
} // *MatchingHandleCount == 0 (ELSE)\r
} // no error on ParseHandleDatabaseByRelationshipWithType\r
FreePool (HandleType);\r
}\r
\r
+ ASSERT ((MatchingHandleBuffer == NULL) ||\r
+ (*MatchingHandleCount == 0 && *MatchingHandleBuffer == NULL) ||\r
+ (*MatchingHandleCount != 0 && *MatchingHandleBuffer != NULL));\r
return Status;\r
}\r
\r
Gets handles for any child controllers of the passed in controller.\r
\r
@param[in] ControllerHandle The handle of the "parent controller"\r
- @param[in] MatchingHandleCount Pointer to the number of handles in\r
+ @param[out] MatchingHandleCount Pointer to the number of handles in\r
MatchingHandleBuffer on return.\r
@param[out] MatchingHandleBuffer Buffer containing handles on a successful\r
return.\r
EFIAPI\r
ParseHandleDatabaseForChildControllers(\r
IN CONST EFI_HANDLE ControllerHandle,\r
- IN UINTN *MatchingHandleCount,\r
+ OUT UINTN *MatchingHandleCount,\r
OUT EFI_HANDLE **MatchingHandleBuffer OPTIONAL\r
)\r
{\r
\r
FreePool (DriverBindingHandleBuffer);\r
\r
+ if (MatchingHandleBuffer == NULL || *MatchingHandleCount == 0) {\r
+ //\r
+ // The caller is not interested in the actual handles, or we've found none.\r
+ //\r
+ FreePool (HandleBufferForReturn);\r
+ HandleBufferForReturn = NULL;\r
+ }\r
+\r
if (MatchingHandleBuffer != NULL) {\r
*MatchingHandleBuffer = HandleBufferForReturn;\r
- } else {\r
- FreePool(HandleBufferForReturn);\r
}\r
\r
+ ASSERT ((MatchingHandleBuffer == NULL) ||\r
+ (*MatchingHandleCount == 0 && *MatchingHandleBuffer == NULL) ||\r
+ (*MatchingHandleCount != 0 && *MatchingHandleBuffer != NULL));\r
+\r
return (EFI_SUCCESS);\r
}\r
\r
@return A pointer to (*DestinationBuffer).\r
**/\r
VOID*\r
-EFIAPI\r
BuffernCatGrow (\r
IN OUT VOID **DestinationBuffer,\r
IN OUT UINTN *DestinationSize,\r
projects / mirror_edk2.git / blobdiff