diff options
28 files changed, 32 insertions, 30 deletions
diff --git a/extras/volume_id/lib/cramfs.c b/extras/volume_id/lib/cramfs.c index beb34d5bc0..100ebdec22 100644 --- a/extras/volume_id/lib/cramfs.c +++ b/extras/volume_id/lib/cramfs.c @@ -45,7 +45,7 @@ int volume_id_probe_cramfs(struct volume_id *id, uint64_t off) { struct cramfs_super *cs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); cs = (struct cramfs_super *) volume_id_get_buffer(id, off, 0x200); if (cs == NULL) diff --git a/extras/volume_id/lib/ext.c b/extras/volume_id/lib/ext.c index 51c0011218..7d41a3287e 100644 --- a/extras/volume_id/lib/ext.c +++ b/extras/volume_id/lib/ext.c @@ -75,7 +75,7 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off) struct ext2_super_block *es; size_t bsize; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 9a11eaad55..74336b4e6d 100644 --- a/extras/volume_id/lib/fat.c +++ b/extras/volume_id/lib/fat.c @@ -147,7 +147,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off) uint32_t next; int maxloop; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200); if (vs == NULL) diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c index f666b18379..4e34d66ba4 100644 --- a/extras/volume_id/lib/hfs.c +++ b/extras/volume_id/lib/hfs.c @@ -160,7 +160,7 @@ int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off) struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT]; const uint8_t *buf; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 deba540ad5..e441edb776 100644 --- a/extras/volume_id/lib/highpoint.c +++ b/extras/volume_id/lib/highpoint.c @@ -49,7 +49,7 @@ int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off) struct hpt37x_meta *hpt; uint32_t magic; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); buf = volume_id_get_buffer(id, off + HPT37X_CONFIG_OFF, 0x200); if (buf == NULL) diff --git a/extras/volume_id/lib/hpfs.c b/extras/volume_id/lib/hpfs.c index 3e9589fcca..6fec9caf8d 100644 --- a/extras/volume_id/lib/hpfs.c +++ b/extras/volume_id/lib/hpfs.c @@ -38,7 +38,7 @@ int volume_id_probe_hpfs(struct volume_id *id, uint64_t off) { struct hpfs_super *hs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x200); if (hs == NULL) diff --git a/extras/volume_id/lib/iso9660.c b/extras/volume_id/lib/iso9660.c index 7b78a7e992..be64a8b8af 100644 --- a/extras/volume_id/lib/iso9660.c +++ b/extras/volume_id/lib/iso9660.c @@ -59,7 +59,7 @@ int volume_id_probe_iso9660(struct volume_id *id, uint64_t off) struct iso_volume_descriptor *is; struct high_sierra_volume_descriptor *hs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); buf = volume_id_get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200); if (buf == NULL) diff --git a/extras/volume_id/lib/isw_raid.c b/extras/volume_id/lib/isw_raid.c index 6465a31bf5..f5761e826b 100644 --- a/extras/volume_id/lib/isw_raid.c +++ b/extras/volume_id/lib/isw_raid.c @@ -43,7 +43,7 @@ int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint uint64_t meta_off; struct isw_meta *isw; - dbg("probing at offset 0x%llx, size 0x%llx", + info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x10000) diff --git a/extras/volume_id/lib/jfs.c b/extras/volume_id/lib/jfs.c index b230fb258c..80360915a4 100644 --- a/extras/volume_id/lib/jfs.c +++ b/extras/volume_id/lib/jfs.c @@ -45,7 +45,7 @@ int volume_id_probe_jfs(struct volume_id *id, uint64_t off) { struct jfs_super_block *js; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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/linux_raid.c b/extras/volume_id/lib/linux_raid.c index ad4a5ba4d6..17819375ba 100644 --- a/extras/volume_id/lib/linux_raid.c +++ b/extras/volume_id/lib/linux_raid.c @@ -54,7 +54,7 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size uint64_t sboff; uint8_t uuid[16]; - dbg("probing at offset 0x%llx, size 0x%llx", + info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x10000) diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c index b63f1e6c00..3937f8ea46 100644 --- a/extras/volume_id/lib/linux_swap.c +++ b/extras/volume_id/lib/linux_swap.c @@ -42,7 +42,7 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off) const uint8_t *buf; unsigned int page; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); /* 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 f1db4a6e50..56fd5671d3 100644 --- a/extras/volume_id/lib/lsi_raid.c +++ b/extras/volume_id/lib/lsi_raid.c @@ -38,7 +38,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; - dbg("probing at offset 0x%llx, size 0x%llx", + info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x10000) diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c index 47d84b0968..727204280b 100644 --- a/extras/volume_id/lib/lvm.c +++ b/extras/volume_id/lib/lvm.c @@ -46,7 +46,7 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off) const uint8_t *buf; struct lvm1_super_block *lvm; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); buf = volume_id_get_buffer(id, off + LVM1_SB_OFF, 0x800); if (buf == NULL) diff --git a/extras/volume_id/lib/minix.c b/extras/volume_id/lib/minix.c index 75e9c3acbd..c5e16e783b 100644 --- a/extras/volume_id/lib/minix.c +++ b/extras/volume_id/lib/minix.c @@ -46,7 +46,7 @@ int volume_id_probe_minix(struct volume_id *id, uint64_t off) { struct minix_super_block *ms; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); ms = (struct minix_super_block *) volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200); if (ms == NULL) diff --git a/extras/volume_id/lib/ntfs.c b/extras/volume_id/lib/ntfs.c index f1e8c4bc29..5f2a5b93a2 100644 --- a/extras/volume_id/lib/ntfs.c +++ b/extras/volume_id/lib/ntfs.c @@ -105,7 +105,7 @@ int volume_id_probe_ntfs(struct volume_id *id, uint64_t off) const uint8_t *buf; const uint8_t *val; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); ns = (struct ntfs_super_block *) volume_id_get_buffer(id, off, 0x200); if (ns == NULL) diff --git a/extras/volume_id/lib/nvidia_raid.c b/extras/volume_id/lib/nvidia_raid.c index 10c1c714f7..ca42459307 100644 --- a/extras/volume_id/lib/nvidia_raid.c +++ b/extras/volume_id/lib/nvidia_raid.c @@ -41,7 +41,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; - dbg("probing at offset 0x%llx, size 0x%llx", + info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x10000) diff --git a/extras/volume_id/lib/ocfs.c b/extras/volume_id/lib/ocfs.c index b376ead833..bf311415dd 100644 --- a/extras/volume_id/lib/ocfs.c +++ b/extras/volume_id/lib/ocfs.c @@ -132,6 +132,8 @@ int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off) struct ocfs1_super_block_header *osh; struct ocfs1_super_block_label *osl; + info("probing at offset 0x%llx", (unsigned long long) off); + buf = volume_id_get_buffer(id, off, 0x200); if (buf == NULL) return -1; @@ -168,7 +170,7 @@ int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off) struct ocfs2_super_block *os; size_t blksize; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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/promise_raid.c b/extras/volume_id/lib/promise_raid.c index 2a2ce1689e..1c4d3658ce 100644 --- a/extras/volume_id/lib/promise_raid.c +++ b/extras/volume_id/lib/promise_raid.c @@ -42,7 +42,7 @@ int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, u 63, 255, 256, 16, 399, 0 }; - dbg("probing at offset 0x%llx, size 0x%llx", + info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x40000) diff --git a/extras/volume_id/lib/reiserfs.c b/extras/volume_id/lib/reiserfs.c index b5706f86e0..abeb06b88f 100644 --- a/extras/volume_id/lib/reiserfs.c +++ b/extras/volume_id/lib/reiserfs.c @@ -60,7 +60,7 @@ int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off) struct reiser4_super_block *rs4; uint8_t *buf; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 8bb2a0018a..a88781e36e 100644 --- a/extras/volume_id/lib/romfs.c +++ b/extras/volume_id/lib/romfs.c @@ -37,7 +37,7 @@ int volume_id_probe_romfs(struct volume_id *id, uint64_t off) { struct romfs_super *rfs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 017b023e27..634e4abd0b 100644 --- a/extras/volume_id/lib/silicon_raid.c +++ b/extras/volume_id/lib/silicon_raid.c @@ -53,7 +53,7 @@ int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint uint64_t meta_off; struct silicon_meta *sil; - dbg("probing at offset 0x%llx, size 0x%llx", + info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); if (size < 0x10000) diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c index bdb1f16628..fdba64edbc 100644 --- a/extras/volume_id/lib/squashfs.c +++ b/extras/volume_id/lib/squashfs.c @@ -36,7 +36,7 @@ int volume_id_probe_squashfs(struct volume_id *id, uint64_t off) { struct squashfs_super *sqs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); sqs = (struct squashfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200); if (sqs == NULL) diff --git a/extras/volume_id/lib/sysv.c b/extras/volume_id/lib/sysv.c index 52349c0623..6e0ed046f0 100644 --- a/extras/volume_id/lib/sysv.c +++ b/extras/volume_id/lib/sysv.c @@ -95,7 +95,7 @@ int volume_id_probe_sysv(struct volume_id *id, uint64_t off) struct xenix_super *xs; unsigned int boff; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 d7497ec51b..d71e9d6f5d 100644 --- a/extras/volume_id/lib/udf.c +++ b/extras/volume_id/lib/udf.c @@ -72,7 +72,7 @@ int volume_id_probe_udf(struct volume_id *id, uint64_t off) unsigned int loc; unsigned int clen; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 d3960b1bec..8255b6e791 100644 --- a/extras/volume_id/lib/ufs.c +++ b/extras/volume_id/lib/ufs.c @@ -175,7 +175,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off) struct ufs_super_block *ufs; int offsets[] = {0, 8, 64, 256, -1}; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 cf5392cf9a..09bfc67500 100644 --- a/extras/volume_id/lib/util.c +++ b/extras/volume_id/lib/util.c @@ -180,7 +180,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len) { ssize_t buf_len; - dbg("get buffer off 0x%llx(%llu), len 0x%zx", (unsigned long long) off, (unsigned long long) off, len); + info("get buffer off 0x%llx(%llu), len 0x%zx", (unsigned long long) off, (unsigned long long) off, len); /* check if requested area fits in superblock buffer */ if (off + len <= SB_BUFFER_SIZE) { if (id->sbbuf == NULL) { @@ -193,7 +193,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) { - dbg("read sbbuf len:0x%llx", (unsigned long long) (off + len)); + info("read sbbuf len:0x%llx", (unsigned long long) (off + len)); if (lseek(id->fd, 0, SEEK_SET) < 0) { dbg("lseek failed (%s)", strerror(errno)); return NULL; @@ -229,7 +229,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))) { - dbg("read seekbuf off:0x%llx len:0x%zx", (unsigned long long) off, len); + info("read seekbuf off:0x%llx len:0x%zx", (unsigned long long) off, len); if (lseek(id->fd, off, SEEK_SET) < 0) { dbg("lseek failed (%s)", strerror(errno)); return NULL; diff --git a/extras/volume_id/lib/vxfs.c b/extras/volume_id/lib/vxfs.c index d10cc37762..112666192c 100644 --- a/extras/volume_id/lib/vxfs.c +++ b/extras/volume_id/lib/vxfs.c @@ -37,7 +37,7 @@ int volume_id_probe_vxfs(struct volume_id *id, uint64_t off) { struct vxfs_super *vxs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); 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 3d870c41e7..9228fe4c88 100644 --- a/extras/volume_id/lib/xfs.c +++ b/extras/volume_id/lib/xfs.c @@ -45,7 +45,7 @@ int volume_id_probe_xfs(struct volume_id *id, uint64_t off) { struct xfs_super_block *xs; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx", (unsigned long long) off); xs = (struct xfs_super_block *) volume_id_get_buffer(id, off, 0x200); if (xs == NULL) |