Enabled -Wall and -Werror and fixed resulting bugs.

[reactos.git] / reactos / apps / utils / partinfo / partinfo.c

diff --git a/reactos/apps/utils/partinfo/partinfo.c b/reactos/apps/utils/partinfo/partinfo.c
index 56dbd48..9dc9a68 100644 (file)
--- a/reactos/apps/utils/partinfo/partinfo.c
+++ b/reactos/apps/utils/partinfo/partinfo.c
@@ -4,6 +4,7 @@
 
 #include <windows.h>
 //#include <winioctl.h>
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -83,7 +84,7 @@ int main (int argc, char *argv[])
   ulDrive = strtoul(argv[1], NULL, 10);
   if (errno != 0)
     {
-      printf("Error: Malformed drive number\n", errno);
+      printf("Error: Malformed drive number\n");
       return(0);
     }
 
@@ -139,7 +140,7 @@ int main (int argc, char *argv[])
                       NULL))
     {
       CloseHandle(hDisk);
-      printf("DeviceIoControl failed! Error: %u\n",
+      printf("DeviceIoControl failed! Error: %lu\n",
             GetLastError());
       free(Buffer);
       return 0;
@@ -149,7 +150,7 @@ int main (int argc, char *argv[])
   HexDump((char*)&DiskGeometry, dwRead);
 #endif
   printf("Drive number: %lu\n", ulDrive);
-  printf("Cylinders: %I64u\nMediaType: %lx\nTracksPerCylinder: %lu\n"
+  printf("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n"
         "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n",
         DiskGeometry.Cylinders.QuadPart,
         DiskGeometry.MediaType,
@@ -177,7 +178,7 @@ int main (int argc, char *argv[])
                       NULL))
     {
       CloseHandle(hDisk);
-      printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %u\n",
+      printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %lu\n",
             GetLastError());
       free(Buffer);
       return 0;
@@ -191,13 +192,13 @@ int main (int argc, char *argv[])
 
   LayoutBuffer = (DRIVE_LAYOUT_INFORMATION*)Buffer;
 
-  printf("Partitions %u  Signature %x\n",
+  printf("Partitions %lu  Signature %lx\n",
         LayoutBuffer->PartitionCount,
         LayoutBuffer->Signature);
 
   for (i = 0; i < LayoutBuffer->PartitionCount; i++)
     {
-      printf(" %d: nr: %d boot: %1x type: %x start: 0x%I64x count: 0x%I64x\n",
+      printf(" %ld: nr: %ld boot: %1x type: %x start: 0x%I64x count: 0x%I64x\n",
             i,
             LayoutBuffer->PartitionEntry[i].PartitionNumber,
             LayoutBuffer->PartitionEntry[i].BootIndicator,