X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=src%2Fprobe.c;h=a4f1f313f0c8cd22ffe53248aac3cd409b62c0ae;hb=0fbc23b104256965cbb3678e85a0ae55a5149c58;hp=91062d363cf8d9909b8415257eab4e05622b9e42;hpb=0a7ead9db7967764f0d93d30f9a83c94cb6fc358;p=rrq%2Fmaintain_lilo.git

diff --git a/src/probe.c b/src/probe.c
index 91062d3..a4f1f31 100644
--- a/src/probe.c
+++ b/src/probe.c
@@ -1,12 +1,12 @@
-/* probe.c -- BIOS probes */
-/*
-Copyright 1999-2006 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the 
-source directory.
-
-*/
+/* probe.c  -  BIOS probe utility
+ * 
+ * Copyright 1999-2006 John Coffman
+ * Copyright 2009-2015 Joachim Wiedorn
+ * All rights reserved.
+ * 
+ * Licensed under the terms contained in the file 'COPYING'
+ * in the source directory.
+ */
 
 /*#define DEBUG_PROBE*/
 #define BITMAP 0	/* change to 1 when do_bitmap is filled in */
@@ -149,12 +149,12 @@ static struct partitions {
     { "DOS12", PART_DOS12, HIDDEN_OFF },
     { "DOS16_small", PART_DOS16_SMALL, HIDDEN_OFF },
     { "DOS16_big", PART_DOS16_BIG, HIDDEN_OFF },
-    { "NTFS or OS2_HPFS", PART_NTFS, HIDDEN_OFF },	/* same as HPFS; keep these two together */
+    { "NTFS", PART_NTFS, HIDDEN_OFF },	/* same as HPFS; keep these two together */
 /*  { "HPFS", PART_HPFS, HIDDEN_OFF },	*/	/* same as NTFS */
     { "FAT32", PART_FAT32, HIDDEN_OFF },
     { "FAT32_lba", PART_FAT32_LBA, HIDDEN_OFF },
     { "FAT16_lba", PART_FAT16_LBA, HIDDEN_OFF },
-    { "OS/2 BootMgr", PART_OS2_BOOTMGR, 0 },
+/*  { "OS/2 BootMgr", PART_OS2_BOOTMGR, 0 }, */  /* obsolete system */
     { "DOS extended", PART_DOS_EXTD, 0 },
     { "WIN extended", PART_WIN_EXTD_LBA, 0 },
     { "Linux ext'd", PART_LINUX_EXTD, 0 },
@@ -675,7 +675,7 @@ static void do_table(char *part)
 {
     struct partition pt [PART_MAX_MAX+1];
     int volid;
-    long long where[PART_MAX_MAX+1];
+    int64_t where[PART_MAX_MAX+1];
     int i,j;
     int extd = (extended_pt || verbose>0);
     
@@ -693,7 +693,7 @@ static void do_table(char *part)
     }
     if (verbose>=5) {
     	printf("\n");
-    	for (i=0; i<j; i++) printf("%4d%20lld%12d\n", i+1, where[i], (int)(where[i]/SECTOR_SIZE));
+    	for (i=0; i<j; i++) printf("%4d%20" PRId64 "%12d\n", i+1, where[i], (int)(where[i]/SECTOR_SIZE));
     }
 }
 
@@ -999,8 +999,8 @@ int bios_device(GEOMETRY *geo, int device)
     while (--bios >= 0x80) {
 	get_geom(bios, &bdata);
 	if (verbose>=5) {
-		printf("bios_dev: (0x%02X)  vol-ID=%08X  *PT=%08lX\n",
-			bios, bdata.serial_no, (long)bdata.pt);
+		printf("bios_dev: (0x%02X)  vol-ID=%08X  *PT=%0*" PRIXPTR "\n",
+			bios, bdata.serial_no, PTR_WIDTH, (intptr_t)bdata.pt);
 #ifdef DEBUG_PROBE
 		dump_pt((void*)bdata.pt);
 #endif