]> git.proxmox.com Git - mirror_edk2.git/commitdiff
ShellPkg: Correct incorrect use of sizeof to use macro for EFI_FILE_INFO size.
authorjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 18 Nov 2011 17:02:36 +0000 (17:02 +0000)
committerjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 18 Nov 2011 17:02:36 +0000 (17:02 +0000)
Signed-off-by: jcarsey
Reviewed-by: niruiyu
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12740 6f19259b-4bc3-4df7-8a09-765794883524

ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c

index a93ef33c039c02dd602add040a5ac28855b8ee59..541e782925ab2fe6e5bbe08860c087ca56804295 100644 (file)
@@ -324,13 +324,13 @@ ValidateAndMoveFiles(
     // construct the new file info block\r
     //\r
     NewSize = StrSize(DestPath);\r
-    NewSize += StrSize(Node->FileName) + sizeof(EFI_FILE_INFO) + sizeof(CHAR16);\r
+    NewSize += StrSize(Node->FileName) + SIZE_OF_EFI_FILE_INFO + sizeof(CHAR16);\r
     NewFileInfo = AllocateZeroPool(NewSize);\r
     if (NewFileInfo == NULL) {\r
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);\r
       ShellStatus = SHELL_OUT_OF_RESOURCES;\r
     } else {\r
-      CopyMem(NewFileInfo, Node->Info, sizeof(EFI_FILE_INFO));\r
+      CopyMem(NewFileInfo, Node->Info, SIZE_OF_EFI_FILE_INFO);\r
       if (DestPath[0] != L'\\') {\r
         StrCpy(NewFileInfo->FileName, L"\\");\r
         StrCat(NewFileInfo->FileName, DestPath);\r
@@ -350,7 +350,7 @@ ValidateAndMoveFiles(
         }\r
         StrCat(NewFileInfo->FileName, Node->FileName);\r
       }\r
-      NewFileInfo->Size = sizeof(EFI_FILE_INFO) + StrSize(NewFileInfo->FileName);\r
+      NewFileInfo->Size = SIZE_OF_EFI_FILE_INFO + StrSize(NewFileInfo->FileName);\r
       ShellPrintEx(-1, -1, HiiOutput, Node->FullName, NewFileInfo->FileName);\r
 \r
       if (!EFI_ERROR(ShellFileExists(NewFileInfo->FileName))) {\r