// If dumping an image, then do that and quit\r
//\r
if (mOptions.DumpOption == 1) {\r
- for (FList = mOptions.FileList; FList != NULL; FList = FList->Next) {\r
- if ((Ptr0 = strstr ((CONST CHAR8 *)FList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) {\r
+ if (mOptions.FileList != NULL) {\r
+ if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) {\r
DumpImage (mOptions.FileList);\r
goto BailOut;\r
} else {\r
}\r
\r
if (mOptions.Verbose) {\r
- VerboseMsg(" Output size = 0x%X\n", Size);\r
+ VerboseMsg(" Output size = 0x%X\n", (unsigned) Size);\r
}\r
\r
if (Status != STATUS_SUCCESS) {\r
UINT32 Index;\r
UINT8 ByteCheckSum;\r
\r
-\r
+ PciDs23 = NULL;\r
+ PciDs30 = NULL;\r
Status = STATUS_SUCCESS;\r
\r
//\r
fseek (InFptr, 0, SEEK_END);\r
FileSize = ftell (InFptr);\r
if (mOptions.Verbose) {\r
- VerboseMsg(" File size = 0x%X\n", FileSize);\r
+ VerboseMsg(" File size = 0x%X\n", (unsigned) FileSize);\r
}\r
\r
fseek (InFptr, 0, SEEK_SET);\r
\r
Buffer[FileSize - 1] = (UINT8) ((~ByteCheckSum) + 1);\r
if (mOptions.Verbose) {\r
- VerboseMsg(" Checksum = %02x\n\n", (UINT32) Buffer[FileSize - 1]);\r
+ VerboseMsg(" Checksum = %02x\n\n", Buffer[FileSize - 1]);\r
}\r
\r
//\r
}\r
\r
if (mOptions.Verbose) {\r
- VerboseMsg(" File size = 0x%X\n", FileSize);\r
+ VerboseMsg(" File size = 0x%X\n", (unsigned) FileSize);\r
}\r
//\r
// Allocate memory for the entire file (in case we have to compress), then\r
// Now compute the size, then swap buffer pointers.\r
//\r
if (mOptions.Verbose) {\r
- VerboseMsg(" Comp size = 0x%X\n", CompressedFileSize);\r
+ VerboseMsg(" Comp size = 0x%X\n", (unsigned) CompressedFileSize);\r
}\r
\r
TotalSize = CompressedFileSize + HeaderSize;\r
}\r
\r
if (mOptions.Verbose) {\r
- VerboseMsg(" Got subsystem = 0x%X from image\n", (int) *SubSystem);\r
+ VerboseMsg(" Got subsystem = 0x%X from image\n", *SubSystem);\r
}\r
\r
//\r
return 1;\r
}\r
if (DebugLevel > 9) {\r
- Error (NULL, 0, 2000, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", Argv[1]);\r
+ Error (NULL, 0, 2000, "Invalid option value", "Debug Level range is 0-9, current input level is %d", Argv[1]);\r
return 1;\r
}\r
if (DebugLevel>=5 && DebugLevel<=9) {\r
//\r
// Dump the contents of the header\r
//\r
- fprintf (stdout, "Image %d -- Offset 0x%X\n", ImageCount, ImageStart);\r
+ fprintf (stdout, "Image %u -- Offset 0x%X\n", (unsigned) ImageCount, (unsigned) ImageStart);\r
fprintf (stdout, " ROM header contents\n");\r
- fprintf (stdout, " Signature 0x%04X\n", (UINT32) PciRomHdr.Signature);\r
- fprintf (stdout, " PCIR offset 0x%04X\n", (UINT32) PciRomHdr.PcirOffset);\r
+ fprintf (stdout, " Signature 0x%04X\n", PciRomHdr.Signature);\r
+ fprintf (stdout, " PCIR offset 0x%04X\n", PciRomHdr.PcirOffset);\r
//\r
// Find PCI data structure\r
//\r
fprintf (\r
stdout,\r
" Class Code 0x%06X\n",\r
- (UINT32) (PciDs23.ClassCode[0] | (PciDs23.ClassCode[1] << 8) | (PciDs23.ClassCode[2] << 16))\r
+ (unsigned) (PciDs23.ClassCode[0] | (PciDs23.ClassCode[1] << 8) | (PciDs23.ClassCode[2] << 16))\r
);\r
- fprintf (stdout, " Image size 0x%X\n", PciDs23.ImageLength * 512);\r
+ fprintf (stdout, " Image size 0x%X\n", (unsigned) PciDs23.ImageLength * 512);\r
fprintf (stdout, " Code revision: 0x%04X\n", PciDs23.CodeRevision);\r
- fprintf (stdout, " Indicator 0x%02X", (UINT32) PciDs23.Indicator);\r
+ fprintf (stdout, " Indicator 0x%02X", PciDs23.Indicator);\r
} else {\r
fprintf (\r
stdout,\r
fprintf (stdout, " Device ID 0x%04X\n", PciDs30.DeviceId);\r
fprintf (stdout, " Length 0x%04X\n", PciDs30.Length);\r
fprintf (stdout, " Revision 0x%04X\n", PciDs30.Revision);\r
- fprintf (stdout, " DeviceListOffset 0x%02X\n", (UINT32) PciDs30.DeviceListOffset); \r
+ fprintf (stdout, " DeviceListOffset 0x%02X\n", PciDs30.DeviceListOffset); \r
fprintf (\r
stdout,\r
" Class Code 0x%06X\n",\r
- (UINT32) (PciDs30.ClassCode[0] | (PciDs30.ClassCode[1] << 8) | (PciDs30.ClassCode[2] << 16))\r
+ (unsigned) (PciDs30.ClassCode[0] | (PciDs30.ClassCode[1] << 8) | (PciDs30.ClassCode[2] << 16))\r
);\r
- fprintf (stdout, " Image size 0x%X\n", PciDs30.ImageLength * 512);\r
+ fprintf (stdout, " Image size 0x%X\n", (unsigned) PciDs30.ImageLength * 512);\r
fprintf (stdout, " Code revision: 0x%04X\n", PciDs30.CodeRevision);\r
- fprintf (stdout, " MaxRuntimeImageLength 0x%02X\n", (UINT32) PciDs30.MaxRuntimeImageLength);\r
- fprintf (stdout, " ConfigUtilityCodeHeaderOffset 0x%02X\n", (UINT32) PciDs30.ConfigUtilityCodeHeaderOffset);\r
- fprintf (stdout, " DMTFCLPEntryPointOffset 0x%02X\n", (UINT32) PciDs30.DMTFCLPEntryPointOffset); \r
- fprintf (stdout, " Indicator 0x%02X", (UINT32) PciDs30.Indicator); \r
+ fprintf (stdout, " MaxRuntimeImageLength 0x%02X\n", PciDs30.MaxRuntimeImageLength);\r
+ fprintf (stdout, " ConfigUtilityCodeHeaderOffset 0x%02X\n", PciDs30.ConfigUtilityCodeHeaderOffset);\r
+ fprintf (stdout, " DMTFCLPEntryPointOffset 0x%02X\n", PciDs30.DMTFCLPEntryPointOffset); \r
+ fprintf (stdout, " Indicator 0x%02X", PciDs30.Indicator); \r
}\r
//\r
// Print the indicator, used to flag the last image\r
// Print the code type. If EFI code, then we can provide more info.\r
//\r
if (mOptions.Pci23 == 1) {\r
- fprintf (stdout, " Code type 0x%02X", (UINT32) PciDs23.CodeType);\r
+ fprintf (stdout, " Code type 0x%02X", PciDs23.CodeType);\r
} else {\r
- fprintf (stdout, " Code type 0x%02X", (UINT32) PciDs30.CodeType); \r
+ fprintf (stdout, " Code type 0x%02X", PciDs30.CodeType); \r
}\r
if (PciDs23.CodeType == PCI_CODE_TYPE_EFI_IMAGE || PciDs30.CodeType == PCI_CODE_TYPE_EFI_IMAGE) {\r
fprintf (stdout, " (EFI image)\n");\r
//\r
// Now dump more info\r
//\r
- fprintf (stdout, " EFI Signature 0x%04X\n", EfiRomHdr.EfiSignature);\r
+ fprintf (stdout, " EFI Signature 0x%04X\n", (unsigned) EfiRomHdr.EfiSignature);\r
fprintf (\r
stdout,\r
" Compression Type 0x%04X ",\r
- (UINT32) EfiRomHdr.CompressionType\r
+ EfiRomHdr.CompressionType\r
);\r
if (EfiRomHdr.CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {\r
fprintf (stdout, "(compressed)\n");\r
fprintf (\r
stdout,\r
" EFI image offset 0x%04X (@0x%X)\n",\r
- (UINT32) EfiRomHdr.EfiImageHeaderOffset,\r
- (UINT32) (EfiRomHdr.EfiImageHeaderOffset + ImageStart)\r
+ EfiRomHdr.EfiImageHeaderOffset,\r
+ EfiRomHdr.EfiImageHeaderOffset + (unsigned) ImageStart\r
);\r
\r
} else {\r