sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/CapsuleApp: Use StrToGuid in BaseLib

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Ruiyu Ni
2017-02-21 17:04:29 +08:00
parent 96d3713578
commit 787f6744e7
2 changed files with 6 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
View File

@@ -1,7 +1,7 @@
/** @file
A shell application that triggers capsule update process.
Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -142,24 +142,6 @@ WriteFileFromBuffer (
IN VOID *Buffer
);
/**
Converts a string to GUID value.
Guid Format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
@param[in] Str The registry format GUID string that contains the GUID value.
@param[out] Guid A pointer to the converted GUID value.
@retval EFI_SUCCESS The GUID string was successfully converted to the GUID value.
@retval EFI_UNSUPPORTED The input string is not in registry format.
@return others Some error occurred when converting part of GUID value.
**/
EFI_STATUS
InternalStrToGuid (
IN CHAR16 *Str,
OUT EFI_GUID *Guid
);
/**
This function parse application ARG.
@@ -731,6 +713,7 @@ UefiMain (
)
{
EFI_STATUS Status;
RETURN_STATUS RStatus;
UINTN FileSize[MAX_CAPSULE_NUM];
VOID *CapsuleBuffer[MAX_CAPSULE_NUM];
EFI_CAPSULE_BLOCK_DESCRIPTOR *BlockDescriptors;
@@ -782,10 +765,10 @@ UefiMain (
//
// FMP->GetImage()
//
Status = InternalStrToGuid(Argv[3], &ImageTypeId);
if (EFI_ERROR(Status)) {
RStatus = StrToGuid (Argv[3], &ImageTypeId);
if (RETURN_ERROR (RStatus) || (Argv[3][GUID_STRING_LENGTH] != L'\0')) {
Print (L"Invalid ImageTypeId - %s\n", Argv[3]);
return Status;
return EFI_INVALID_PARAMETER;
}
ImageIndex = StrDecimalToUintn(Argv[4]);
if (StrCmp(Argv[5], L"-O") == 0) {