chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99370c2
)
volume_id: use PRIu64i, PRIx64 macros
author
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 3 Oct 2008 16:24:04 +0000
(18:24 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 3 Oct 2008 16:24:04 +0000
(18:24 +0200)
39 files changed:
extras/volume_id/lib/adaptec_raid.c
patch
|
blob
|
history
extras/volume_id/lib/btrfs.c
patch
|
blob
|
history
extras/volume_id/lib/cramfs.c
patch
|
blob
|
history
extras/volume_id/lib/ddf_raid.c
patch
|
blob
|
history
extras/volume_id/lib/ext.c
patch
|
blob
|
history
extras/volume_id/lib/fat.c
patch
|
blob
|
history
extras/volume_id/lib/gfs.c
patch
|
blob
|
history
extras/volume_id/lib/hfs.c
patch
|
blob
|
history
extras/volume_id/lib/highpoint.c
patch
|
blob
|
history
extras/volume_id/lib/hpfs.c
patch
|
blob
|
history
extras/volume_id/lib/iso9660.c
patch
|
blob
|
history
extras/volume_id/lib/isw_raid.c
patch
|
blob
|
history
extras/volume_id/lib/jfs.c
patch
|
blob
|
history
extras/volume_id/lib/jmicron_raid.c
patch
|
blob
|
history
extras/volume_id/lib/libvolume_id-private.h
patch
|
blob
|
history
extras/volume_id/lib/linux_raid.c
patch
|
blob
|
history
extras/volume_id/lib/linux_swap.c
patch
|
blob
|
history
extras/volume_id/lib/lsi_raid.c
patch
|
blob
|
history
extras/volume_id/lib/lvm.c
patch
|
blob
|
history
extras/volume_id/lib/minix.c
patch
|
blob
|
history
extras/volume_id/lib/netware.c
patch
|
blob
|
history
extras/volume_id/lib/ntfs.c
patch
|
blob
|
history
extras/volume_id/lib/nvidia_raid.c
patch
|
blob
|
history
extras/volume_id/lib/ocfs.c
patch
|
blob
|
history
extras/volume_id/lib/oracleasm.c
patch
|
blob
|
history
extras/volume_id/lib/promise_raid.c
patch
|
blob
|
history
extras/volume_id/lib/reiserfs.c
patch
|
blob
|
history
extras/volume_id/lib/romfs.c
patch
|
blob
|
history
extras/volume_id/lib/silicon_raid.c
patch
|
blob
|
history
extras/volume_id/lib/squashfs.c
patch
|
blob
|
history
extras/volume_id/lib/sysv.c
patch
|
blob
|
history
extras/volume_id/lib/udf.c
patch
|
blob
|
history
extras/volume_id/lib/ufs.c
patch
|
blob
|
history
extras/volume_id/lib/util.c
patch
|
blob
|
history
extras/volume_id/lib/via_raid.c
patch
|
blob
|
history
extras/volume_id/lib/volume_id.c
patch
|
blob
|
history
extras/volume_id/lib/vxfs.c
patch
|
blob
|
history
extras/volume_id/lib/xfs.c
patch
|
blob
|
history
extras/volume_id/vol_id.c
patch
|
blob
|
history
diff --git
a/extras/volume_id/lib/adaptec_raid.c
b/extras/volume_id/lib/adaptec_raid.c
index a76b7321d86d123887f98fa570ef02eac03b360d..d20399c0ff62a1f97eeb25a5734c205be088afe1 100644
(file)
--- a/
extras/volume_id/lib/adaptec_raid.c
+++ b/
extras/volume_id/lib/adaptec_raid.c
@@
-91,8
+91,7
@@
int volume_id_probe_adaptec_raid(struct volume_id *id, uint64_t off, uint64_t si
uint64_t meta_off;
struct adaptec_meta *ad;
uint64_t meta_off;
struct adaptec_meta *ad;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/btrfs.c
b/extras/volume_id/lib/btrfs.c
index aae2fa616e82c93e8ba9e3c0d551b1825ae10431..660e6dab38e42fc46c54968aeccd04fb7f15b625 100644
(file)
--- a/
extras/volume_id/lib/btrfs.c
+++ b/
extras/volume_id/lib/btrfs.c
@@
-75,8
+75,7
@@
int volume_id_probe_btrfs(struct volume_id *id, uint64_t off, uint64_t size)
const uint8_t *buf;
struct btrfs_super_block *bfs;
const uint8_t *buf;
struct btrfs_super_block *bfs;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long)off, (unsigned long long)size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
buf = volume_id_get_buffer(id, off + 0x4000, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + 0x4000, 0x200);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/cramfs.c
b/extras/volume_id/lib/cramfs.c
index ed54dfd352d3eb97d4494249e9a0515dbd2f8325..b6460da5df9f0c1a08c01b44c94a11ce75db0b50 100644
(file)
--- a/
extras/volume_id/lib/cramfs.c
+++ b/
extras/volume_id/lib/cramfs.c
@@
-50,7
+50,7
@@
int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size)
{
struct cramfs_super *cs;
{
struct cramfs_super *cs;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
cs = (struct cramfs_super *) volume_id_get_buffer(id, off, 0x200);
if (cs == NULL)
cs = (struct cramfs_super *) volume_id_get_buffer(id, off, 0x200);
if (cs == NULL)
diff --git
a/extras/volume_id/lib/ddf_raid.c
b/extras/volume_id/lib/ddf_raid.c
index 53d309b8c0f63d76a679a8aaa05181d9489a8a41..58bdae94a734fd378319e9eedd7de35a15c43916 100644
(file)
--- a/
extras/volume_id/lib/ddf_raid.c
+++ b/
extras/volume_id/lib/ddf_raid.c
@@
-50,8
+50,7
@@
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
const uint8_t *buf;
struct ddf_header *ddf;
const uint8_t *buf;
struct ddf_header *ddf;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long)off, (unsigned long long)size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x30000)
return -1;
if (size < 0x30000)
return -1;
@@
-62,11
+61,11
@@
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
- info("header (little endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header (little endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
- info("header (big endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header (big endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
goto found;
}
@@
-77,11
+76,11
@@
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
return -1;
ddf = (struct ddf_header *) buf;
if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0) {
- info("header adaptec (little endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header adaptec (little endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
goto found;
}
if (memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0) {
- info("header adaptec (big endian) found at %
llu\n", (unsigned long long)
(off + ddf_off));
+ info("header adaptec (big endian) found at %
" PRIu64 "\n",
(off + ddf_off));
goto found;
}
goto found;
}
diff --git
a/extras/volume_id/lib/ext.c
b/extras/volume_id/lib/ext.c
index 97299d60d8b1b3815bcdb41e7e351468d03c1296..13ec470291e06ea2b41b9624c249299c07286fcc 100644
(file)
--- a/
extras/volume_id/lib/ext.c
+++ b/
extras/volume_id/lib/ext.c
@@
-135,7
+135,7
@@
int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size)
uint32_t feature_incompat;
uint32_t flags;
uint32_t feature_incompat;
uint32_t flags;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
es = (struct ext2_super_block *) volume_id_get_buffer(id, off + EXT_SUPERBLOCK_OFFSET, 0x200);
if (es == NULL)
es = (struct ext2_super_block *) volume_id_get_buffer(id, off + EXT_SUPERBLOCK_OFFSET, 0x200);
if (es == NULL)
diff --git
a/extras/volume_id/lib/fat.c
b/extras/volume_id/lib/fat.c
index 62ff6b664f6fccfe3d554b60ce4b6e1a76726e78..e5a5cc119180b025b59225f7379640867508f309 100644
(file)
--- a/
extras/volume_id/lib/fat.c
+++ b/
extras/volume_id/lib/fat.c
@@
-275,7
+275,7
@@
int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size)
int maxloop;
size_t fnlen;
int maxloop;
size_t fnlen;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off, 0x400);
if (buf == NULL)
buf = volume_id_get_buffer(id, off, 0x400);
if (buf == NULL)
@@
-380,7
+380,7
@@
magic:
/* the label may be an attribute in the root directory */
root_start = (reserved + fat_size) * sector_size;
/* the label may be an attribute in the root directory */
root_start = (reserved + fat_size) * sector_size;
- dbg("root dir start 0x%
llx\n", (unsigned long long)
root_start);
+ dbg("root dir start 0x%
" PRIx64 "\n",
root_start);
root_dir_entries = le16_to_cpu(vs->dir_entries);
dbg("expected entries 0x%x\n", root_dir_entries);
root_dir_entries = le16_to_cpu(vs->dir_entries);
dbg("expected entries 0x%x\n", root_dir_entries);
@@
-442,7
+442,7
@@
fat32:
dbg("next cluster %u\n", next);
next_sect_off = (next - 2) * vs->sectors_per_cluster;
next_off = (start_data_sect + next_sect_off) * sector_size;
dbg("next cluster %u\n", next);
next_sect_off = (next - 2) * vs->sectors_per_cluster;
next_off = (start_data_sect + next_sect_off) * sector_size;
- dbg("cluster offset 0x%
llx\n", (unsigned long long)
next_off);
+ dbg("cluster offset 0x%
" PRIx64 "\n",
next_off);
/* get cluster */
buf = volume_id_get_buffer(id, off + next_off, buf_size);
/* get cluster */
buf = volume_id_get_buffer(id, off + next_off, buf_size);
diff --git
a/extras/volume_id/lib/gfs.c
b/extras/volume_id/lib/gfs.c
index a8b5080ec4fa8d21abd1b8b9472fd248069d33cd..25f96f668bd569a0ff7bbf9640d04125bd9ed01b 100644
(file)
--- a/
extras/volume_id/lib/gfs.c
+++ b/
extras/volume_id/lib/gfs.c
@@
-83,7
+83,7
@@
static int volume_id_probe_gfs_generic(struct volume_id *id, uint64_t off, int v
{
struct gfs2_sb *sbd;
{
struct gfs2_sb *sbd;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
sbd = (struct gfs2_sb *)
volume_id_get_buffer(id, off + GFS_SUPERBLOCK_OFFSET, sizeof(struct gfs2_sb));
sbd = (struct gfs2_sb *)
volume_id_get_buffer(id, off + GFS_SUPERBLOCK_OFFSET, sizeof(struct gfs2_sb));
diff --git
a/extras/volume_id/lib/hfs.c
b/extras/volume_id/lib/hfs.c
index dbc5f36195e6cb6d32566b7fa772e150d81590d1..903378b34ed0fb8acc937ed963afde23cb052ba5 100644
(file)
--- a/
extras/volume_id/lib/hfs.c
+++ b/
extras/volume_id/lib/hfs.c
@@
-188,7
+188,7
@@
int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t siz
struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
const uint8_t *buf;
struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
const uint8_t *buf;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
@@
-211,7
+211,7
@@
int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t siz
off += (alloc_first_block * 512) +
(embed_first_block * alloc_block_size);
off += (alloc_first_block * 512) +
(embed_first_block * alloc_block_size);
- dbg("hfs wrapped hfs+ found at offset 0x%
llx\n", (unsigned long long)
off);
+ dbg("hfs wrapped hfs+ found at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/highpoint.c
b/extras/volume_id/lib/highpoint.c
index 7c91f5d2c5f12b4644ad52210d1bc30f11605d35..33554f29a3001f62baee83389e0d6ec8fa8e0a75 100644
(file)
--- a/
extras/volume_id/lib/highpoint.c
+++ b/
extras/volume_id/lib/highpoint.c
@@
-54,7
+54,7
@@
int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint6
struct hpt37x_meta *hpt;
uint32_t magic;
struct hpt37x_meta *hpt;
uint32_t magic;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + HPT37X_CONFIG_OFF, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + HPT37X_CONFIG_OFF, 0x200);
if (buf == NULL)
@@
-78,8
+78,7
@@
int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint6
uint64_t meta_off;
uint32_t magic;
uint64_t meta_off;
uint32_t magic;
- dbg("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ dbg("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/hpfs.c
b/extras/volume_id/lib/hpfs.c
index 80ba289773619fbe860a4e96393e3c16d62ce543..ce9118d3703577be872776789e3b530bd2db9533 100644
(file)
--- a/
extras/volume_id/lib/hpfs.c
+++ b/
extras/volume_id/lib/hpfs.c
@@
-80,7
+80,7
@@
int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size)
struct hpfs_spare_super *hss;
struct hpfs_boot_block *hbb;
struct hpfs_spare_super *hss;
struct hpfs_boot_block *hbb;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x400);
if (hs == NULL)
hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x400);
if (hs == NULL)
diff --git
a/extras/volume_id/lib/iso9660.c
b/extras/volume_id/lib/iso9660.c
index 913e5b8a0e98d9b584daee587eef14546e90a976..ea1464b066950406f17858edadc955acdbd58712 100644
(file)
--- a/
extras/volume_id/lib/iso9660.c
+++ b/
extras/volume_id/lib/iso9660.c
@@
-64,7
+64,7
@@
int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size)
struct iso_volume_descriptor *is;
struct high_sierra_volume_descriptor *hs;
struct iso_volume_descriptor *is;
struct high_sierra_volume_descriptor *hs;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
@@
-91,7
+91,7
@@
int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size)
if (is->type != ISO_VD_SUPPLEMENTARY)
continue;
if (is->type != ISO_VD_SUPPLEMENTARY)
continue;
- dbg("found SVD at offset 0x%
llx\n", (unsigned long long)
(off + vd_offset));
+ dbg("found SVD at offset 0x%
" PRIx64 "\n",
(off + vd_offset));
if (memcmp(is->escape_sequences, "%/@", 3) == 0||
memcmp(is->escape_sequences, "%/C", 3) == 0||
memcmp(is->escape_sequences, "%/E", 3) == 0) {
if (memcmp(is->escape_sequences, "%/@", 3) == 0||
memcmp(is->escape_sequences, "%/C", 3) == 0||
memcmp(is->escape_sequences, "%/E", 3) == 0) {
diff --git
a/extras/volume_id/lib/isw_raid.c
b/extras/volume_id/lib/isw_raid.c
index 382e45d5db8cce3e1085adc5e518b874ee89b1a0..db31249716fd36b69680f2920582a8a75ffd8264 100644
(file)
--- a/
extras/volume_id/lib/isw_raid.c
+++ b/
extras/volume_id/lib/isw_raid.c
@@
-48,8
+48,7
@@
int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint
uint64_t meta_off;
struct isw_meta *isw;
uint64_t meta_off;
struct isw_meta *isw;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/jfs.c
b/extras/volume_id/lib/jfs.c
index d496cf8781ada7d348345deb629b69138b384ad2..b84ded349bd2d7216e329fd601bd003a65525050 100644
(file)
--- a/
extras/volume_id/lib/jfs.c
+++ b/
extras/volume_id/lib/jfs.c
@@
-50,7
+50,7
@@
int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size)
{
struct jfs_super_block *js;
{
struct jfs_super_block *js;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200);
if (js == NULL)
js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200);
if (js == NULL)
diff --git
a/extras/volume_id/lib/jmicron_raid.c
b/extras/volume_id/lib/jmicron_raid.c
index 134e7aa4e1b8e1b8b58a40836a39157a227beba5..e14862f3404b654ac3506aaef8ca815f02eebaba 100644
(file)
--- a/
extras/volume_id/lib/jmicron_raid.c
+++ b/
extras/volume_id/lib/jmicron_raid.c
@@
-44,8
+44,7
@@
int volume_id_probe_jmicron_raid(struct volume_id *id, uint64_t off, uint64_t si
uint64_t meta_off;
struct jmicron_meta *jm;
uint64_t meta_off;
struct jmicron_meta *jm;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/libvolume_id-private.h
b/extras/volume_id/lib/libvolume_id-private.h
index 356d899209b35573a5baa79e15ca34d3b86611af..14f7568fec60f30977bc64a84f7ec8992d5241c8 100644
(file)
--- a/
extras/volume_id/lib/libvolume_id-private.h
+++ b/
extras/volume_id/lib/libvolume_id-private.h
@@
-20,9
+20,10
@@
#ifndef _LIBVOLUME_ID_PRIVATE_H_
#define _LIBVOLUME_ID_PRIVATE_H_
#ifndef _LIBVOLUME_ID_PRIVATE_H_
#define _LIBVOLUME_ID_PRIVATE_H_
-#include <stdint.h>
#include <stddef.h>
#include <endian.h>
#include <stddef.h>
#include <endian.h>
+#include <stdint.h>
+#include <inttypes.h>
#include <byteswap.h>
#include <syslog.h>
#include <byteswap.h>
#include <syslog.h>
diff --git
a/extras/volume_id/lib/linux_raid.c
b/extras/volume_id/lib/linux_raid.c
index f7d1af4fe73379b71b67906f0ab5a575ca52a40b..e84557082395cf6ca6700078d92919514367a2fe 100644
(file)
--- a/
extras/volume_id/lib/linux_raid.c
+++ b/
extras/volume_id/lib/linux_raid.c
@@
-72,8
+72,7
@@
static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
uint8_t bytes[16];
} uuid;
uint8_t bytes[16];
} uuid;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
@@
-127,8
+126,7
@@
static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
const uint8_t *buf;
struct mdp1_super_block *mdp1;
const uint8_t *buf;
struct mdp1_super_block *mdp1;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
buf = volume_id_get_buffer(id, off, 0x800);
if (buf == NULL)
buf = volume_id_get_buffer(id, off, 0x800);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/linux_swap.c
b/extras/volume_id/lib/linux_swap.c
index 7cf3d35396cece01e5397a3aea3cc52949cf42c1..7b24a46b2ddc5ca71adc19453d65449104734c32 100644
(file)
--- a/
extras/volume_id/lib/linux_swap.c
+++ b/
extras/volume_id/lib/linux_swap.c
@@
-48,7
+48,7
@@
int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
unsigned int page;
struct swap_header_v1_2 *sw;
unsigned int page;
struct swap_header_v1_2 *sw;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
/* eek, the swap signature is at the end of the PAGE_SIZE */
for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
/* eek, the swap signature is at the end of the PAGE_SIZE */
for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
diff --git
a/extras/volume_id/lib/lsi_raid.c
b/extras/volume_id/lib/lsi_raid.c
index b4495a2c524d5a23c1248d9c29d0719f7f7c9c69..5a6ba4c72af0321a771d0dde80b300958909cae4 100644
(file)
--- a/
extras/volume_id/lib/lsi_raid.c
+++ b/
extras/volume_id/lib/lsi_raid.c
@@
-43,8
+43,7
@@
int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t s
uint64_t meta_off;
struct lsi_meta *lsi;
uint64_t meta_off;
struct lsi_meta *lsi;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/lvm.c
b/extras/volume_id/lib/lvm.c
index 1d62ec9331f3bb464d85b5ce75db3b0b3f99f7eb..a3f409a0eeff45b659431f6282b29d424028a01a 100644
(file)
--- a/
extras/volume_id/lib/lvm.c
+++ b/
extras/volume_id/lib/lvm.c
@@
-56,7
+56,7
@@
int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size)
const uint8_t *buf;
struct lvm1_super_block *lvm;
const uint8_t *buf;
struct lvm1_super_block *lvm;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + LVM1_SB_OFF, 0x800);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + LVM1_SB_OFF, 0x800);
if (buf == NULL)
@@
-83,7
+83,7
@@
int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size)
struct lvm2_super_block *lvm;
struct lvm2_pv_header *pvhdr;
struct lvm2_super_block *lvm;
struct lvm2_pv_header *pvhdr;
- dbg("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ dbg("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off, LVM2LABEL_SCAN_SECTORS * 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off, LVM2LABEL_SCAN_SECTORS * 0x200);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/minix.c
b/extras/volume_id/lib/minix.c
index 5644cca43fa9c66a828df4f6ac9db3febf14dd2f..cca158560279a9c71f8409864fad3b34c085b764 100644
(file)
--- a/
extras/volume_id/lib/minix.c
+++ b/
extras/volume_id/lib/minix.c
@@
-75,7
+75,7
@@
int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size)
struct minix_super_block *ms;
struct minix3_super_block *m3s;
struct minix_super_block *ms;
struct minix3_super_block *m3s;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/netware.c
b/extras/volume_id/lib/netware.c
index e6ca5da3a3336028a1d2adcbc467c5dfb53f4d5c..58749e5f0571cffa57a8661766bbe764965a1efe 100644
(file)
--- a/
extras/volume_id/lib/netware.c
+++ b/
extras/volume_id/lib/netware.c
@@
-87,7
+87,7
@@
int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size)
{
struct netware_super_block *nw;
{
struct netware_super_block *nw;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
nw = (struct netware_super_block *) volume_id_get_buffer(id, off + NW_SUPERBLOCK_OFFSET, 0x200);
if (nw == NULL)
nw = (struct netware_super_block *) volume_id_get_buffer(id, off + NW_SUPERBLOCK_OFFSET, 0x200);
if (nw == NULL)
diff --git
a/extras/volume_id/lib/ntfs.c
b/extras/volume_id/lib/ntfs.c
index 8154e7685ae625660a7d8fcface78972a9a6b153..f861b4bf28bbb1c58d6a7fc9ee3512a6882f5f65 100644
(file)
--- a/
extras/volume_id/lib/ntfs.c
+++ b/
extras/volume_id/lib/ntfs.c
@@
-110,7
+110,7
@@
int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size)
const uint8_t *buf;
const uint8_t *val;
const uint8_t *buf;
const uint8_t *val;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
ns = (struct ntfs_super_block *) volume_id_get_buffer(id, off, 0x200);
if (ns == NULL)
ns = (struct ntfs_super_block *) volume_id_get_buffer(id, off, 0x200);
if (ns == NULL)
@@
-137,8
+137,8
@@
int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size)
dbg("sectorsize 0x%x\n", sector_size);
dbg("clustersize 0x%x\n", cluster_size);
dbg("sectorsize 0x%x\n", sector_size);
dbg("clustersize 0x%x\n", cluster_size);
- dbg("mftcluster %
llu\n", (unsigned long long)
mft_cluster);
- dbg("mftoffset 0x%
llx\n", (unsigned long long)
mft_off);
+ dbg("mftcluster %
" PRIu64 "\n",
mft_cluster);
+ dbg("mftoffset 0x%
" PRIx64 "\n",
mft_off);
dbg("cluster per mft_record %i\n", ns->cluster_per_mft_record);
dbg("mft record size %i\n", mft_record_size);
dbg("cluster per mft_record %i\n", ns->cluster_per_mft_record);
dbg("mft record size %i\n", mft_record_size);
diff --git
a/extras/volume_id/lib/nvidia_raid.c
b/extras/volume_id/lib/nvidia_raid.c
index cbd0d5b059aba9aba02467c9a5f481df767fae95..2969dbe3dd6adda7f20b8003dcf1569d528653e2 100644
(file)
--- a/
extras/volume_id/lib/nvidia_raid.c
+++ b/
extras/volume_id/lib/nvidia_raid.c
@@
-46,8
+46,7
@@
int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t siz
uint64_t meta_off;
struct nvidia_meta *nv;
uint64_t meta_off;
struct nvidia_meta *nv;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/ocfs.c
b/extras/volume_id/lib/ocfs.c
index b0038f4ccb32e9172b02ca2769e2b8be5c1926f0..e7bf55c4212f32b0bf2b69b66371a1940e3066b0 100644
(file)
--- a/
extras/volume_id/lib/ocfs.c
+++ b/
extras/volume_id/lib/ocfs.c
@@
-136,7
+136,7
@@
int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size)
struct ocfs1_super_block_header *osh;
struct ocfs1_super_block_label *osl;
struct ocfs1_super_block_header *osh;
struct ocfs1_super_block_label *osl;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off, 0x200);
if (buf == NULL)
@@
-174,7
+174,7
@@
int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size)
struct ocfs2_super_block *os;
size_t blksize;
struct ocfs2_super_block *os;
size_t blksize;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
for (blksize = 0x200; blksize <= OCFS2_MAX_BLOCKSIZE; blksize <<= 1) {
buf = volume_id_get_buffer(id, off + OCFS2_SUPER_BLOCK_BLKNO * blksize, 0x200);
for (blksize = 0x200; blksize <= OCFS2_MAX_BLOCKSIZE; blksize <<= 1) {
buf = volume_id_get_buffer(id, off + OCFS2_SUPER_BLOCK_BLKNO * blksize, 0x200);
diff --git
a/extras/volume_id/lib/oracleasm.c
b/extras/volume_id/lib/oracleasm.c
index 069bb33ff2ff7b25fb3ae3c6bcbce6a8943f23e5..8e63fb120918dfe9785c9d7692195c48e46219fd 100644
(file)
--- a/
extras/volume_id/lib/oracleasm.c
+++ b/
extras/volume_id/lib/oracleasm.c
@@
-50,7
+50,7
@@
int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size)
const uint8_t *buf;
struct oracleasm_super_block *oracleasm;
const uint8_t *buf;
struct oracleasm_super_block *oracleasm;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + ASM_SB_OFF, 0x800);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + ASM_SB_OFF, 0x800);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/promise_raid.c
b/extras/volume_id/lib/promise_raid.c
index d4a5b0468325b7d2b36beb9359180ca9511fe723..cdc90a1a6568832facf39fc0d833eea3c6905548 100644
(file)
--- a/
extras/volume_id/lib/promise_raid.c
+++ b/
extras/volume_id/lib/promise_raid.c
@@
-47,8
+47,7
@@
int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, u
63, 255, 256, 16, 399, 0
};
63, 255, 256, 16, 399, 0
};
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x40000)
return -1;
if (size < 0x40000)
return -1;
diff --git
a/extras/volume_id/lib/reiserfs.c
b/extras/volume_id/lib/reiserfs.c
index 5c48c066337349ba36a2e5cfdb18b29c551b1767..cdc46912ab3d9b360194d42bf4c2f41bb3938be6 100644
(file)
--- a/
extras/volume_id/lib/reiserfs.c
+++ b/
extras/volume_id/lib/reiserfs.c
@@
-65,7
+65,7
@@
int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size)
struct reiser4_super_block *rs4;
uint8_t *buf;
struct reiser4_super_block *rs4;
uint8_t *buf;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
buf = volume_id_get_buffer(id, off + REISERFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
buf = volume_id_get_buffer(id, off + REISERFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
diff --git
a/extras/volume_id/lib/romfs.c
b/extras/volume_id/lib/romfs.c
index a49d7e2aa3560e41ed7d7bbdd8742bd4cfa1acbf..1c9a6f24979e3c79d925a1c6db26653d8718be53 100644
(file)
--- a/
extras/volume_id/lib/romfs.c
+++ b/
extras/volume_id/lib/romfs.c
@@
-42,7
+42,7
@@
int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size)
{
struct romfs_super *rfs;
{
struct romfs_super *rfs;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
rfs = (struct romfs_super *) volume_id_get_buffer(id, off, 0x200);
if (rfs == NULL)
rfs = (struct romfs_super *) volume_id_get_buffer(id, off, 0x200);
if (rfs == NULL)
diff --git
a/extras/volume_id/lib/silicon_raid.c
b/extras/volume_id/lib/silicon_raid.c
index abb8a1d3041f274c3dd05e18712b1335769a8db9..42897882834a729b4b450d61da53e166b4bf17f8 100644
(file)
--- a/
extras/volume_id/lib/silicon_raid.c
+++ b/
extras/volume_id/lib/silicon_raid.c
@@
-58,8
+58,7
@@
int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint
uint64_t meta_off;
struct silicon_meta *sil;
uint64_t meta_off;
struct silicon_meta *sil;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/squashfs.c
b/extras/volume_id/lib/squashfs.c
index c4d961d31ee5f96c2cba6fc3fa4494329edf3895..6952e5cecaa5809a55f9e319a12fbd640af587ab 100644
(file)
--- a/
extras/volume_id/lib/squashfs.c
+++ b/
extras/volume_id/lib/squashfs.c
@@
-50,7
+50,7
@@
int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size)
{
struct squashfs_super *sqs;
{
struct squashfs_super *sqs;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
sqs = (struct squashfs_super *) volume_id_get_buffer(id, off, 0x200);
if (sqs == NULL)
sqs = (struct squashfs_super *) volume_id_get_buffer(id, off, 0x200);
if (sqs == NULL)
diff --git
a/extras/volume_id/lib/sysv.c
b/extras/volume_id/lib/sysv.c
index 66262df371211ba99389464e623789c75b445a09..586dc1d145d528d4b7aa88e6e41f86bc1f8795ac 100644
(file)
--- a/
extras/volume_id/lib/sysv.c
+++ b/
extras/volume_id/lib/sysv.c
@@
-100,7
+100,7
@@
int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size)
struct xenix_super *xs;
unsigned int boff;
struct xenix_super *xs;
unsigned int boff;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
for (boff = 0x200; boff <= SYSV_MAX_BLOCKSIZE; boff <<= 1) {
vs = (struct sysv_super *)
for (boff = 0x200; boff <= SYSV_MAX_BLOCKSIZE; boff <<= 1) {
vs = (struct sysv_super *)
diff --git
a/extras/volume_id/lib/udf.c
b/extras/volume_id/lib/udf.c
index bf0833df802d74350797cc9c4a69ae5a1e42bb9b..aed0d76b52ed073d9770ca28fa44766145a4fe27 100644
(file)
--- a/
extras/volume_id/lib/udf.c
+++ b/
extras/volume_id/lib/udf.c
@@
-77,7
+77,7
@@
int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size)
unsigned int loc;
unsigned int clen;
unsigned int loc;
unsigned int clen;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET, 0x200);
if (vsd == NULL)
vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET, 0x200);
if (vsd == NULL)
diff --git
a/extras/volume_id/lib/ufs.c
b/extras/volume_id/lib/ufs.c
index 54cc85c43c4891be550745e8080f3599356acd87..0648b454d38819e0d92fe17064ecbdb00bb19c57 100644
(file)
--- a/
extras/volume_id/lib/ufs.c
+++ b/
extras/volume_id/lib/ufs.c
@@
-180,7
+180,7
@@
int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size)
struct ufs_super_block *ufs;
int offsets[] = {0, 8, 64, 256, -1};
struct ufs_super_block *ufs;
int offsets[] = {0, 8, 64, 256, -1};
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
for (i = 0; offsets[i] >= 0; i++) {
ufs = (struct ufs_super_block *) volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);
for (i = 0; offsets[i] >= 0; i++) {
ufs = (struct ufs_super_block *) volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);
diff --git
a/extras/volume_id/lib/util.c
b/extras/volume_id/lib/util.c
index 0fb8937962b2e08d3bade17dca2128c83d3580a7..671f97ee271407a5a194935360e4aad4ab75027f 100644
(file)
--- a/
extras/volume_id/lib/util.c
+++ b/
extras/volume_id/lib/util.c
@@
-352,7
+352,7
@@
uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
{
ssize_t buf_len;
{
ssize_t buf_len;
- info("get buffer off 0x%
llx(%llu), len 0x%zx\n", (unsigned long long) off, (unsigned long long)
off, len);
+ info("get buffer off 0x%
" PRIx64 "(%" PRIu64 "), len 0x%zx\n", off,
off, len);
/* check if requested area fits in superblock buffer */
if (off + len <= SB_BUFFER_SIZE) {
if (id->sbbuf == NULL) {
/* check if requested area fits in superblock buffer */
if (off + len <= SB_BUFFER_SIZE) {
if (id->sbbuf == NULL) {
@@
-365,7
+365,7
@@
uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
/* check if we need to read */
if ((off + len) > id->sbbuf_len) {
/* check if we need to read */
if ((off + len) > id->sbbuf_len) {
- info("read sbbuf len:0x%
llx\n", (unsigned long long)
(off + len));
+ info("read sbbuf len:0x%
" PRIx64 "\n",
(off + len));
if (lseek(id->fd, 0, SEEK_SET) < 0) {
dbg("lseek failed (%s)\n", strerror(errno));
return NULL;
if (lseek(id->fd, 0, SEEK_SET) < 0) {
dbg("lseek failed (%s)\n", strerror(errno));
return NULL;
@@
-401,7
+401,7
@@
uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
/* check if we need to read */
if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
/* check if we need to read */
if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
- info("read seekbuf off:0x%
llx len:0x%zx\n", (unsigned long long)
off, len);
+ info("read seekbuf off:0x%
" PRIx64 " len:0x%zx\n",
off, len);
if (lseek(id->fd, off, SEEK_SET) < 0) {
dbg("lseek failed (%s)\n", strerror(errno));
return NULL;
if (lseek(id->fd, off, SEEK_SET) < 0) {
dbg("lseek failed (%s)\n", strerror(errno));
return NULL;
diff --git
a/extras/volume_id/lib/via_raid.c
b/extras/volume_id/lib/via_raid.c
index e4ddd2244c4511ac00e81ed77c142fb9cff3ae61..9e4be5a90d4e74585cbebe8596b9132ea7bd64f2 100644
(file)
--- a/
extras/volume_id/lib/via_raid.c
+++ b/
extras/volume_id/lib/via_raid.c
@@
-68,8
+68,7
@@
int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size)
uint64_t meta_off;
struct via_meta *via;
uint64_t meta_off;
struct via_meta *via;
- dbg("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ dbg("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
if (size < 0x10000)
return -1;
if (size < 0x10000)
return -1;
diff --git
a/extras/volume_id/lib/volume_id.c
b/extras/volume_id/lib/volume_id.c
index c9ad02b9ae1d5c2e6ea519391881fba298e8fe34..791be43515323f4e10be84883db5b46329d052a7 100644
(file)
--- a/
extras/volume_id/lib/volume_id.c
+++ b/
extras/volume_id/lib/volume_id.c
@@
-367,8
+367,7
@@
int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
if (!device_is_readable(id, off))
return -1;
if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (prober_raid[i].prober(id, off, size) == 0)
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (prober_raid[i].prober(id, off, size) == 0)
@@
-401,8
+400,7
@@
int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
if (!device_is_readable(id, off))
return -1;
if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (prober_filesystem[i].prober(id, off, size) == 0)
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (prober_filesystem[i].prober(id, off, size) == 0)
diff --git
a/extras/volume_id/lib/vxfs.c
b/extras/volume_id/lib/vxfs.c
index 06501af26275cdec4307ec7a53d0e12b434f8805..da569495d273b2ec795c30e004f793a5f34a6b5b 100644
(file)
--- a/
extras/volume_id/lib/vxfs.c
+++ b/
extras/volume_id/lib/vxfs.c
@@
-42,7
+42,7
@@
int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size)
{
struct vxfs_super *vxs;
{
struct vxfs_super *vxs;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
vxs = (struct vxfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200);
if (vxs == NULL)
vxs = (struct vxfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200);
if (vxs == NULL)
diff --git
a/extras/volume_id/lib/xfs.c
b/extras/volume_id/lib/xfs.c
index 98ba6572fc98652f0940f6939505457c8d1685b8..35ba68ed3e917d70258759e180748182ebfb531e 100644
(file)
--- a/
extras/volume_id/lib/xfs.c
+++ b/
extras/volume_id/lib/xfs.c
@@
-32,14
+32,14
@@
#include "libvolume_id-private.h"
struct xfs_super_block {
#include "libvolume_id-private.h"
struct xfs_super_block {
- uint8_t magic[4];
+ uint8_t
magic[4];
uint32_t blocksize;
uint64_t dblocks;
uint64_t rblocks;
uint32_t dummy1[2];
uint32_t blocksize;
uint64_t dblocks;
uint64_t rblocks;
uint32_t dummy1[2];
- uint8_t uuid[16];
+ uint8_t
uuid[16];
uint32_t dummy2[15];
uint32_t dummy2[15];
- uint8_t fname[12];
+ uint8_t
fname[12];
uint32_t dummy3[2];
uint64_t icount;
uint64_t ifree;
uint32_t dummy3[2];
uint64_t icount;
uint64_t ifree;
@@
-50,7
+50,7
@@
int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size)
{
struct xfs_super_block *xs;
{
struct xfs_super_block *xs;
- info("probing at offset 0x%
llx\n", (unsigned long long)
off);
+ info("probing at offset 0x%
" PRIx64 "\n",
off);
xs = (struct xfs_super_block *) volume_id_get_buffer(id, off, 0x200);
if (xs == NULL)
xs = (struct xfs_super_block *) volume_id_get_buffer(id, off, 0x200);
if (xs == NULL)
diff --git
a/extras/volume_id/vol_id.c
b/extras/volume_id/vol_id.c
index b153bc54101668f0039f0531d82cf0459b7c0564..b4db5adcd86210dcebcdd6e4ca414f92a8bffa42 100644
(file)
--- a/
extras/volume_id/vol_id.c
+++ b/
extras/volume_id/vol_id.c
@@
-31,6
+31,7
@@
#include <grp.h>
#include <getopt.h>
#include <fcntl.h>
#include <grp.h>
#include <getopt.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <sys/ioctl.h>
#include "../../udev/udev.h"
#include <sys/ioctl.h>
#include "../../udev/udev.h"
@@
-247,7
+248,7
@@
int main(int argc, char *argv[])
if (size == 0) {
if (ioctl(fd, BLKGETSIZE64, &size) != 0)
size = 0;
if (size == 0) {
if (ioctl(fd, BLKGETSIZE64, &size) != 0)
size = 0;
- info(udev_ctx, "BLKGETSIZE64=%
llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)
size >> 30);
+ info(udev_ctx, "BLKGETSIZE64=%
" PRIu64 " (%" PRIu64 "GB)\n", size,
size >> 30);
}
/* try to drop all privileges before reading disk content */
}
/* try to drop all privileges before reading disk content */