From 49893f3a5c7cd5bfe962c3b63b299ee713170b8e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 31 Dec 2012 18:04:44 -0600 Subject: [PATCH] Fix format specifiers in some debugging statements --- src/dentry.c | 2 +- src/lookup_table.c | 6 ++++-- src/mount_image.c | 7 ++++--- src/ntfs-capture.c | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/dentry.c b/src/dentry.c index 90cadb43..08c08ab6 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -1473,7 +1473,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, * u64 reserved1; (always 0) * u64 reserved2; (always 0) * };*/ - DEBUG("Dentry for file or directory `%s' has %zu extra " + DEBUG("Dentry for file or directory `%s' has %"PRIu64" extra " "bytes of data", file_name_utf8, dentry->length - calculated_size); } diff --git a/src/lookup_table.c b/src/lookup_table.c index 30835213..077fff97 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -403,9 +403,11 @@ int write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *__out) if (lte->out_refcnt == 0) return 0; - if (lte->output_resource_entry.flags & WIM_RESHDR_FLAG_METADATA) - DEBUG("Writing metadata entry at %lu (orig size = %zu)", + if (lte->output_resource_entry.flags & WIM_RESHDR_FLAG_METADATA) { + DEBUG("Writing metadata entry at %"PRIu64" " + "(orig size = %"PRIu64")", ftello(out), lte->output_resource_entry.original_size); + } p = put_resource_entry(buf, <e->output_resource_entry); p = put_u16(p, lte->part_number); diff --git a/src/mount_image.c b/src/mount_image.c index 55b09890..905157c0 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -165,7 +165,8 @@ static int alloc_wimfs_fd(struct wim_inode *inode, pthread_mutex_lock(&inode->i_mutex); - DEBUG("Allocating fd for stream ID %u from inode %lx (open = %u, allocated = %u)", + DEBUG("Allocating fd for stream ID %u from inode %#"PRIx64" " + "(open = %u, allocated = %u)", stream_id, inode->i_ino, inode->i_num_opened_fds, inode->i_num_allocated_fds); @@ -265,7 +266,7 @@ static int lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd) static int close_wimfs_fd(struct wimfs_fd *fd) { int ret; - DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)", + DEBUG("Closing fd (ino = %#"PRIx64", opened = %u, allocated = %u)", fd->f_inode->i_ino, fd->f_inode->i_num_opened_fds, fd->f_inode->i_num_allocated_fds); ret = lte_put_fd(fd->f_lte, fd); @@ -1835,7 +1836,7 @@ static int wimfs_read(const char *path, char *buf, size_t size, wimlib_assert(fd->f_lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); - DEBUG("Seek to offset %zu", offset); + DEBUG("Seek to offset %"PRIu64, offset); if (lseek(fd->staging_fd, offset, SEEK_SET) == -1) return -errno; diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 5662572b..67efbc85 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -340,7 +340,7 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni, lte->resource_entry.size = data_size; } ntfs_loc = NULL; - DEBUG("Add resource for `%s' (size = %zu)", + DEBUG("Add resource for `%s' (size = %"PRIu64")", dentry->file_name_utf8, lte->resource_entry.original_size); copy_hash(lte->hash, attr_hash); -- 2.43.0