projects
/
rrq
/
maintain_lilo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Next Debian release
[rrq/maintain_lilo.git]
/
src
/
probe.c
diff --git
a/src/probe.c
b/src/probe.c
index 44572633381fa9345db30f5f19530cc139afd7d4..a4f1f313f0c8cd22ffe53248aac3cd409b62c0ae 100644
(file)
--- a/
src/probe.c
+++ b/
src/probe.c
@@
-1,7
+1,7
@@
/* probe.c - BIOS probe utility
*
* Copyright 1999-2006 John Coffman
/* probe.c - BIOS probe utility
*
* Copyright 1999-2006 John Coffman
- * Copyright 2009-201
3
Joachim Wiedorn
+ * Copyright 2009-201
5
Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
@@
-675,7
+675,7
@@
static void do_table(char *part)
{
struct partition pt [PART_MAX_MAX+1];
int volid;
{
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);
int i,j;
int extd = (extended_pt || verbose>0);
@@
-693,7
+693,7
@@
static void do_table(char *part)
}
if (verbose>=5) {
printf("\n");
}
if (verbose>=5) {
printf("\n");
- for (i=0; i<j; i++) printf("%4d%20
lld
%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) {
while (--bios >= 0x80) {
get_geom(bios, &bdata);
if (verbose>=5) {
- printf("bios_dev: (0x%02X) vol-ID=%08X *PT=%0
8lX
\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
#ifdef DEBUG_PROBE
dump_pt((void*)bdata.pt);
#endif