Merge Patch to EfiRom tool to fix GCC build warning.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1510 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/EfiRom/EfiRom.c b/Source/C/EfiRom/EfiRom.c
index d914b82..4a1d3ce 100644 (file)
--- a/Source/C/EfiRom/EfiRom.c
+++ b/Source/C/EfiRom/EfiRom.c
@@ -20,8 +20,13 @@ Abstract:
 \r
 **/\r
 \r
+#include "EfiUtilityMsgs.h"\r
+#include "ParseInf.h"\r
 #include "EfiRom.h"\r
 \r
+UINT64  DebugLevel = 0;\r
+\r
+int\r
 main (\r
   int   Argc,\r
   char  *Argv[]\r
@@ -47,7 +52,7 @@ Returns:
 \r
 --*/\r
 {\r
-  INT8      *Ext;\r
+  CHAR8     *Ext;\r
   FILE      *FptrOut;\r
   UINT32    Status;\r
   FILE_LIST *FList;\r
@@ -135,7 +140,7 @@ Returns:
   // Now open our output file\r
   //\r
   if ((FptrOut = fopen (mOptions.OutFileName, "wb")) == NULL) {\r
-    Error (stdout, 0, 0001, "Error opening file", mOptions.OutFileName);\r
+    Error (NULL, 0, 0001, "Error opening file", "Error opening file %s", mOptions.OutFileName);\r
     goto BailOut;\r
   }\r
   //\r
@@ -157,7 +162,7 @@ Returns:
 \r
       Status = ProcessBinFile (FptrOut, FList, &Size);\r
     } else {\r
-      Error (stdout, 0, 2000, "Invalid parameter", "File type not specified, it must be either an EFI or binary file: %s.", FList->FileName);\r
+      Error (NULL, 0, 2000, "Invalid parameter", "File type not specified, it must be either an EFI or binary file: %s.", FList->FileName);\r
       Status = STATUS_ERROR;\r
     }\r
 \r
@@ -258,9 +263,9 @@ Returns:
   }\r
 \r
   fseek (InFptr, 0, SEEK_SET);\r
-  Buffer = (INT8 *) malloc (FileSize);\r
+  Buffer = (UINT8 *) malloc (FileSize);\r
   if (Buffer == NULL) {\r
-    Error (NULL, 0, 4003, "Resource", "memory cannot be allocated!", NULL);\r
+    Error (NULL, 0, 4003, "Resource", "memory cannot be allocated!");\r
     Status = STATUS_ERROR;\r
     goto BailOut;\r
   }\r
@@ -363,7 +368,7 @@ Returns:
   // Now copy the input file contents out to the output file\r
   //\r
   if (fwrite (Buffer, FileSize, 1, OutFptr) != 1) {\r
-    Error (NULL, 0, 0005, "Failed to write all file bytes to output file.");\r
+    Error (NULL, 0, 0005, "Failed to write all file bytes to output file.", NULL);\r
     Status = STATUS_ERROR;\r
     goto BailOut;\r
   }\r
@@ -492,7 +497,7 @@ Returns:
   // Allocate memory for the entire file (in case we have to compress), then\r
   // seek back to the beginning of the file and read it into our buffer.\r
   //\r
-  Buffer = (INT8 *) malloc (FileSize);\r
+  Buffer = (UINT8 *) malloc (FileSize);\r
   if (Buffer == NULL) {\r
     Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");\r
     Status = STATUS_ERROR;\r
@@ -501,7 +506,7 @@ Returns:
 \r
   fseek (InFptr, 0, SEEK_SET);\r
   if (fread (Buffer, FileSize, 1, InFptr) != 1) {\r
-    Error (NULL, 0, 0004, "Error reading file", InFptr);\r
+    Error (NULL, 0, 0004, "Error reading file", "File %s", InFile->FileName);\r
     Status = STATUS_ERROR;\r
     goto BailOut;\r
   }\r
@@ -514,7 +519,7 @@ Returns:
     // Allocate a buffer into which we can compress the image, compress it,\r
     // and use that size as the new size.\r
     //\r
-    CompressedBuffer = (INT8 *) malloc (FileSize);\r
+    CompressedBuffer = (UINT8 *) malloc (FileSize);\r
     if (CompressedBuffer == NULL) {\r
       Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");\r
       Status = STATUS_ERROR;\r
@@ -524,7 +529,7 @@ Returns:
     CompressedFileSize  = FileSize;\r
     Status              = EfiCompress (Buffer, FileSize, CompressedBuffer, &CompressedFileSize);\r
     if (Status != STATUS_SUCCESS) {\r
-      Error (NULL, 0, 0007, "Error compressing file!");\r
+      Error (NULL, 0, 0007, "Error compressing file!", NULL);\r
       goto BailOut;\r
     }\r
     //\r
@@ -643,7 +648,7 @@ Returns:
   // Write the ROM header to the output file\r
   //\r
   if (fwrite (&RomHdr, sizeof (RomHdr), 1, OutFptr) != 1) {\r
-    Error (NULL, 0, 0002, "Failed to write ROM header to output file!");\r
+    Error (NULL, 0, 0002, "Failed to write ROM header to output file!", NULL);\r
     Status = STATUS_ERROR;\r
     goto BailOut;\r
   }\r
@@ -653,7 +658,7 @@ Returns:
   //\r
   while (HeaderPadBytes > 0) {\r
     if (putc (0, OutFptr) == EOF) {\r
-      Error (NULL, 0, 0002, "Failed to write ROM header pad bytes to output file!");\r
+      Error (NULL, 0, 0002, "Failed to write ROM header pad bytes to output file!", NULL);\r
       Status = STATUS_ERROR;\r
       goto BailOut;\r
     }\r
@@ -665,13 +670,13 @@ Returns:
   //\r
   if (mOptions.Pci23 == 1) {\r
     if (fwrite (&PciDs23, sizeof (PciDs23), 1, OutFptr) != 1) {\r
-      Error (NULL, 0, 0002, "Failed to write PCI ROM header to output file!");\r
+      Error (NULL, 0, 0002, "Failed to write PCI ROM header to output file!", NULL);\r
       Status = STATUS_ERROR;\r
       goto BailOut;\r
     } \r
   } else {\r
     if (fwrite (&PciDs30, sizeof (PciDs30), 1, OutFptr) != 1) {\r
-      Error (NULL, 0, 0002, "Failed to write PCI ROM header to output file!");\r
+      Error (NULL, 0, 0002, "Failed to write PCI ROM header to output file!", NULL);\r
       Status = STATUS_ERROR;\r
       goto BailOut;\r
     } \r
@@ -685,7 +690,7 @@ Returns:
   // Now dump the input file's contents to the output file\r
   //\r
   if (fwrite (Buffer, FileSize, 1, OutFptr) != 1) {\r
-    Error (NULL, 0, 0002, "Failed to write all file bytes to output file!");\r
+    Error (NULL, 0, 0002, "Failed to write all file bytes to output file!", NULL);\r
     Status = STATUS_ERROR;\r
     goto BailOut;\r
   }\r
@@ -696,7 +701,7 @@ Returns:
   //\r
   while (TotalSize > 0) {\r
     if (putc (~0, OutFptr) == EOF) {\r
-      Error (NULL, 0, 2000, "Failed to write trailing pad bytes output file!");\r
+      Error (NULL, 0, 2000, "Failed to write trailing pad bytes output file!", NULL);\r
       Status = STATUS_ERROR;\r
       goto BailOut;\r
     }\r
@@ -769,7 +774,7 @@ Returns:
   // Read the DOS header\r
   //\r
   if (fread (&DosHeader, sizeof (DosHeader), 1, Fptr) != 1) {\r
-    Error (NULL, 0, 0004, "Failed to read the DOS stub from the input file!");\r
+    Error (NULL, 0, 0004, "Failed to read the DOS stub from the input file!", NULL);\r
     return STATUS_ERROR;\r
   }\r
   //\r
@@ -784,7 +789,7 @@ Returns:
   //\r
   fseek (Fptr, (long) DosHeader.e_lfanew, SEEK_SET);\r
   if (fread (&PESig, sizeof (PESig), 1, Fptr) != 1) {\r
-    Error (NULL, 0, 0004, "Failed to read PE signature bytes from input file!");\r
+    Error (NULL, 0, 0004, "Failed to read PE signature bytes from input file!", NULL);\r
     return STATUS_ERROR;\r
   }\r
   //\r
@@ -798,7 +803,7 @@ Returns:
   // Read the file header and stuff their MachineType\r
   //\r
   if (fread (&FileHdr, sizeof (FileHdr), 1, Fptr) != 1) {\r
-    Error (NULL, 0, 0004, "Failed to read PE file header from input file!");\r
+    Error (NULL, 0, 0004, "Failed to read PE file header from input file!", NULL);\r
     return STATUS_ERROR;\r
   }\r
 \r
@@ -808,7 +813,7 @@ Returns:
   // Read the optional header so we can get the subsystem\r
   //\r
   if (fread (&OptionalHdr, sizeof (OptionalHdr), 1, Fptr) != 1) {\r
-    Error (NULL, 0, 0004, "Failed to read COFF optional header from input file!");\r
+    Error (NULL, 0, 0004, "Failed to read COFF optional header from input file!", NULL);\r
     return STATUS_ERROR;\r
   }\r
 \r
@@ -930,7 +935,6 @@ Returns:
         // Device ID specified with -i\r
         // Make sure there's another parameter\r
         //\r
-        //printf("\nDevice id specified!\n");\r
         if (Argc > 1) {\r
           Options->DevId      = (UINT16) strtol (Argv[1], NULL, 16);\r
           Options->DevIdValid = 1;\r
@@ -1085,7 +1089,7 @@ Returns:
       //\r
       FileList = (FILE_LIST *) malloc (sizeof (FILE_LIST));\r
       if (FileList == NULL) {\r
-        Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");\r
+        Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!", NULL);\r
         return STATUS_ERROR;\r
       }\r
       \r
@@ -1398,12 +1402,12 @@ Returns:
       //\r
       fprintf (stdout, "  EFI ROM header contents\n");\r
       if (fseek (InFptr, ImageStart, SEEK_SET)) {\r
-        Error (NULL, 0, 5001, "Failed to re-seek to ROM header structure!");\r
+        Error (NULL, 0, 5001, "Failed to re-seek to ROM header structure!", NULL);\r
         goto BailOut;\r
       }\r
 \r
       if (fread (&EfiRomHdr, sizeof (EfiRomHdr), 1, InFptr) != 1) {\r
-        Error (NULL, 0, 5001, "Failed to read EFI PCI ROM header from file!");\r
+        Error (NULL, 0, 5001, "Failed to read EFI PCI ROM header from file!", NULL);\r
         goto BailOut;\r
       }\r
       //\r

diff --git a/Source/C/EfiRom/EfiRom.h b/Source/C/EfiRom/EfiRom.h
index 41e65a5..2319989 100644 (file)
--- a/Source/C/EfiRom/EfiRom.h
+++ b/Source/C/EfiRom/EfiRom.h
@@ -78,18 +78,13 @@ Abstract:
 #define FILE_FLAG_EFI       0x02\r
 #define FILE_FLAG_COMPRESS  0x04\r
 \r
-//\r
-// global variables\r
-//\r
-UINTN DebugLevel = 0;\r
-\r
 //\r
 // Use this linked list structure to keep track of all the filenames\r
 // specified on the command line.\r
 //\r
 typedef struct _FILE_LIST {\r
   struct _FILE_LIST *Next;\r
-  INT8              *FileName;\r
+  CHAR8             *FileName;\r
   UINT32            FileFlags;\r
   UINT32            ClassCode;\r
   UINT16            CodeRevision;\r
@@ -99,10 +94,7 @@ typedef struct _FILE_LIST {
 // Use this to track our command-line options\r
 //\r
 typedef struct {\r
-  INT8      OutFileName[MAX_PATH];\r
-  INT8      *EfiFileName;\r
-  INT8      *BinFileName;\r
-  INT8      Compress;\r
+  CHAR8     OutFileName[MAX_PATH];\r
   INT8      NoLast;\r
   UINT16    ClassCode;\r
   UINT16    PciRevision;\r
@@ -131,35 +123,27 @@ static OPTIONS  mOptions;
 //\r
 typedef struct {\r
   UINT16  Value;\r
-  char    *Name;\r
+  CHAR8   *Name;\r
 } STRING_LOOKUP;\r
 \r
 //\r
 // Machine Types\r
 //\r
 static STRING_LOOKUP  mMachineTypes[] = {\r
-  EFI_IMAGE_MACHINE_IA32,\r
-  "IA32",\r
-  EFI_IMAGE_MACHINE_IA64,\r
-  "IA64",\r
-  EFI_IMAGE_MACHINE_EBC,\r
-  "EBC",\r
-  0,\r
-  NULL\r
+  { EFI_IMAGE_MACHINE_IA32, "IA32" },\r
+  { EFI_IMAGE_MACHINE_IA64, "IA64" },\r
+  { EFI_IMAGE_MACHINE_EBC, "EBC" },\r
+  { 0, NULL }\r
 };\r
 \r
 //\r
 // Subsystem Types\r
 //\r
 static STRING_LOOKUP  mSubsystemTypes[] = {\r
-  EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION,\r
-  "EFI application",\r
-  EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER,\r
-  "EFI boot service driver",\r
-  EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER,\r
-  "EFI runtime driver",\r
-  0,\r
-  NULL\r
+  { EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION, "EFI application" },\r
+  { EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER, "EFI boot service driver" },\r
+  { EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER, "EFI runtime driver" },\r
+  { 0, NULL }\r
 };\r
 \r
 //\r

diff --git a/Source/C/GenFv/GenFvInternalLib.c b/Source/C/GenFv/GenFvInternalLib.c
index 236255e..8c5e721 100644 (file)
--- a/Source/C/GenFv/GenFvInternalLib.c
+++ b/Source/C/GenFv/GenFvInternalLib.c
@@ -224,7 +224,7 @@ Returns:
   //\r
   // Read the FV Name Guid\r
   //\r
-  Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_FV_NAMEGUID_STRING, 0, Value);\r
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FV_NAMEGUID_STRING, 0, Value);\r
   if (Status == EFI_SUCCESS) {\r
     //\r
     // Get the guid value\r