Sync BaseTools Branch (version r2321) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / C / EfiLdrImage / EfiLdrImage.c

diff --git a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
index 3591a4d71b970ea757d3fc1fe80c9ec60cbabecf..01685964f19c60d8f815bd8070a3fe155e51db94 100644 (file)
--- a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
+++ b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
-Copyright 2006 - 2008, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -83,8 +83,8 @@ Returns:
 \r
 --*/\r
 {\r
-  printf ("%s v%d.%d -Utility to break a file into two pieces at the request offset.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
-  printf ("Copyright (c) 1999-2007 Intel Corporation. All rights reserved.\n");\r
+  printf ("%s v%d.%d %s -Utility to break a file into two pieces at the request offset.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
+  printf ("Copyright (c) 1999-2010 Intel Corporation. All rights reserved.\n");\r
 }\r
 \r
 VOID\r
@@ -131,7 +131,7 @@ Return:
   UINT64 : file size of input file\r
 --*/\r
 {\r
-  UINT64           filesize, offset, length;\r
+  UINT32          filesize, offset, length;\r
   CHAR8           Buffer[8*1024];\r
 \r
   fseek (in, 0, SEEK_END);\r
@@ -252,7 +252,7 @@ Returns:
       continue; \r
     }\r
     //\r
-    // Don't recognize the paramter, should be regarded as the input file name.\r
+    // Don't recognize the parameter, should be regarded as the input file name.\r
     //\r
     InputFileNames[InputFileCount] = argv[0];\r
     InputFileCount++;\r
@@ -309,9 +309,9 @@ Returns:
     //  And in the same time update the EfiLdrHeader and EfiLdrImage array\r
     //\r
     EfiLdrImage[i].Offset = EfiLdrHeader.FileLength;\r
-    EfiLdrImage[i].Length = filesize;\r
+    EfiLdrImage[i].Length = (UINT32) filesize;\r
     strncpy ((CHAR8*) EfiLdrImage[i].FileName, InputFileNames[i], sizeof (EfiLdrImage[i].FileName) - 1);\r
-    EfiLdrHeader.FileLength += filesize;\r
+    EfiLdrHeader.FileLength += (UINT32) filesize;\r
     EfiLdrHeader.NumberOfImages++;\r
   }\r
 \r