Sync basetools' source and binary files with r1707 of the basetools project.

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

diff --git a/BaseTools/Source/C/GenBootSector/GenBootSector.c b/BaseTools/Source/C/GenBootSector/GenBootSector.c
index 47b5c5c67a040e48069f14286dae95659a013beb..05839bb736e356095d49f108232a15136fcd3494 100644 (file)
--- a/BaseTools/Source/C/GenBootSector/GenBootSector.c
+++ b/BaseTools/Source/C/GenBootSector/GenBootSector.c
@@ -26,6 +26,9 @@ Abstract:
 #include <string.h>\r
 #include <Common/UefiBaseTypes.h>\r
 \r
+#include "ParseInf.h"\r
+#include "EfiUtilityMsgs.h"\r
+\r
 //\r
 // Utility Name\r
 //\r
@@ -259,9 +262,9 @@ Routine Description:
         } else {\r
           fprintf (\r
             stdout,\r
-            "%c: - DiskNum: %d, Type: %s\n", \r
+            "%c: - DiskNum: %u, Type: %s\n", \r
             DriveInfo.VolumeLetter,\r
-            DriveInfo.DiskNumber, \r
+            (unsigned) DriveInfo.DiskNumber, \r
             DriveInfo.DriveType->Description\r
             );\r
         }\r
@@ -438,11 +441,9 @@ ProcessBsOrMbr (
   BYTE              DiskPartition[0x200] = {0};\r
   BYTE              DiskPartitionBackup[0x200] = {0};\r
   DWORD             BytesReturn;\r
-  DWORD             DbrOffset;\r
   INT               DrvNumOffset;\r
   HANDLE            InputHandle;\r
   HANDLE            OutputHandle;\r
-  BOOL              WriteToDisk;\r
   ERROR_STATUS      Status;\r
   DWORD             InputDbrOffset;\r
   DWORD             OutputDbrOffset;\r
@@ -731,7 +732,7 @@ main (
         return 1;\r
       }\r
       if (LogLevel > 9) {\r
-        Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", LogLevel);\r
+        Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", (int) LogLevel);\r
         return 1;\r
       }\r
       SetPrintLevel (LogLevel);\r