diff --git a/libntfs/dir.c b/libntfs/dir.c index 0343db43..a08fa48f 100644 --- a/libntfs/dir.c +++ b/libntfs/dir.c @@ -287,7 +287,8 @@ descend_into_child_node: if (br != 1) { if (br != -1) errno = EIO; - ntfs_log_perror("Failed to read vcn 0x%llx", vcn); + ntfs_log_perror("Failed to read vcn 0x%llx", + (unsigned long long)vcn); goto close_err_out; } diff --git a/libntfs/index.c b/libntfs/index.c index a977200b..472254db 100644 --- a/libntfs/index.c +++ b/libntfs/index.c @@ -88,7 +88,8 @@ static int ntfs_ib_write(ntfs_index_context *icx, VCN vcn, void *buf) 1, icx->block_size, buf); if (ret != 1) { ntfs_log_perror("Failed to write index block %lld of inode " - "%llu", vcn, icx->ni->mft_no); + "%llu", (long long)vcn, + (unsigned long long)icx->ni->mft_no); return STATUS_ERROR; } return STATUS_OK; @@ -402,7 +403,8 @@ static int ntfs_ia_check(ntfs_index_context *icx, INDEX_BLOCK *ib, VCN vcn) if (!ntfs_is_indx_record(ib->magic)) { ntfs_log_error("Corrupt index block signature: vcn %lld inode " - "%llu\n", (long long)vcn, icx->ni->mft_no); + "%llu\n", (long long)vcn, + (unsigned long long)icx->ni->mft_no); return -1; } @@ -410,8 +412,9 @@ static int ntfs_ia_check(ntfs_index_context *icx, INDEX_BLOCK *ib, VCN vcn) ntfs_log_error("Corrupt index block: VCN (%lld) is different " "from expected VCN (%lld) in inode %llu\n", - (long long) sle64_to_cpu(ib->index_block_vcn), - (long long)vcn, icx->ni->mft_no); + (long long)sle64_to_cpu(ib->index_block_vcn), + (long long)vcn, + (unsigned long long)icx->ni->mft_no); return -1; } @@ -495,7 +498,8 @@ static int ntfs_ie_lookup(const void *key, const int key_len, (u8 *)ie + le16_to_cpu(ie->length) > index_end) { errno = ERANGE; ntfs_log_error("Index entry out of bounds in inode " - "%llu.\n", icx->ni->mft_no); + "%llu.\n", + (unsigned long long)icx->ni->mft_no); return STATUS_ERROR; } /* @@ -566,7 +570,7 @@ static ntfs_attr *ntfs_ia_open(ntfs_index_context *icx, ntfs_inode *ni) na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, icx->name, icx->name_len); if (!na) { ntfs_log_perror("Failed to open index allocation of inode " - "%llu", ni->mft_no); + "%llu", (unsigned long long)ni->mft_no); return NULL; } return na; @@ -587,7 +591,7 @@ static int ntfs_ib_read(ntfs_index_context *icx, VCN vcn, INDEX_BLOCK *dst) ntfs_log_perror("Failed to read index block"); else ntfs_log_error("Failed to read full index block at " - "%lld\n", pos); + "%lld\n", (long long)pos); return -1; } @@ -759,7 +763,8 @@ descend_into_child_node: if ((ib->index.flags & NODE_MASK) == LEAF_NODE) { ntfs_log_error("Index entry with child node found in a leaf " - "node in inode 0x%llx.\n", ni->mft_no); + "node in inode 0x%llx.\n", + (unsigned long long)ni->mft_no); goto err_out; }