|
From: Anton A. <an...@us...> - 2005-06-21 09:55:25
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26832 Modified Files: attrib.c bootsect.c compress.c dir.c index.c runlist.c Log Message: Fix compiler warnings in libntfs when compiling under cygwin. Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.163 retrieving revision 1.164 diff -u -p -r1.163 -r1.164 --- attrib.c 20 Jun 2005 14:31:58 -0000 1.163 +++ attrib.c 21 Jun 2005 09:55:15 -0000 1.164 @@ -4033,8 +4033,9 @@ retry: */ if (finished_build) { Dprintf("%s(): Mark attr 0x%x for delete in inode " - "0x%llx.\n", __FUNCTION__, le32_to_cpu(a->type), - ctx->ntfs_ino->mft_no); + "0x%llx.\n", __FUNCTION__, + (unsigned)le32_to_cpu(a->type), + ctx->ntfs_ino->mft_no); a->highest_vcn = cpu_to_sle64(NTFS_VCN_DELETE_MARK); ntfs_inode_mark_dirty(ctx->ntfs_ino); continue; Index: bootsect.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- bootsect.c 18 Aug 2004 10:27:49 -0000 1.14 +++ bootsect.c 21 Jun 2005 09:55:15 -0000 1.15 @@ -1,7 +1,7 @@ /* * bootsect.c - Boot sector handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2000-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -213,7 +213,7 @@ int ntfs_boot_sector_parse(ntfs_volume * * illegal, thus signed char is actually ok! */ c = bs->clusters_per_mft_record; - Dprintf("ClusterSize = 0x%x\n", vol->cluster_size); + Dprintf("ClusterSize = 0x%x\n", (unsigned)vol->cluster_size); Dprintf("ClusterSizeBits = %u\n", vol->cluster_size_bits); Dprintf("ClustersPerMftRecord = 0x%x\n", c); /* @@ -233,7 +233,7 @@ int ntfs_boot_sector_parse(ntfs_volume * return -1; } vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1; - Dprintf("MftRecordSize = 0x%x\n", vol->mft_record_size); + Dprintf("MftRecordSize = 0x%x\n", (unsigned)vol->mft_record_size); Dprintf("MftRecordSizeBits = %u\n", vol->mft_record_size_bits); /* * Work out the size of the MFT mirror in number of mft records. If the Index: compress.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compress.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- compress.c 11 May 2004 09:21:24 -0000 1.9 +++ compress.c 21 Jun 2005 09:55:15 -0000 1.10 @@ -2,7 +2,7 @@ * compress.c - Compressed attribute handling code. Part of the Linux-NTFS * project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -84,7 +84,7 @@ static int ntfs_decompress(u8 *dest, con u8 tag; /* Current tag. */ int token; /* Loop counter for the eight tokens in tag. */ - Dprintf("Entering, cb_size = 0x%x.\n", cb_size); + Dprintf("Entering, cb_size = 0x%x.\n", (unsigned)cb_size); do_next_sb: Dprintf("Beginning sub-block at offset = 0x%x in the cb.\n", cb - cb_start); Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- dir.c 12 Jun 2005 18:12:56 -0000 1.16 +++ dir.c 21 Jun 2005 09:55:15 -0000 1.17 @@ -1,7 +1,7 @@ /* * dir.c - Directory handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -111,7 +111,8 @@ u64 ntfs_inode_lookup_by_name(ntfs_inode index_block_size = le32_to_cpu(ir->index_block_size); if (index_block_size < NTFS_BLOCK_SIZE || index_block_size & (index_block_size - 1)) { - Dprintf("Index block size %u is invalid.\n", index_block_size); + Dprintf("Index block size %u is invalid.\n", + (unsigned)index_block_size); goto put_err_out; } index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length); @@ -286,9 +287,9 @@ descend_into_child_node: Dprintf("Index buffer (VCN 0x%llx) of directory inode 0x%llx " "has a size (%u) differing from the directory " "specified size (%u).\n", (long long)vcn, - (unsigned long long)dir_ni->mft_no, + (unsigned long long)dir_ni->mft_no, (unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18, - index_block_size); + (unsigned)index_block_size); errno = EIO; goto close_err_out; } @@ -806,7 +807,8 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 index_block_size = le32_to_cpu(ir->index_block_size); if (index_block_size < NTFS_BLOCK_SIZE || index_block_size & (index_block_size - 1)) { - Dprintf("Index block size %u is invalid.\n", index_block_size); + Dprintf("Index block size %u is invalid.\n", + (unsigned)index_block_size); goto dir_err_out; } index_block_size_bits = ffs(index_block_size) - 1; @@ -963,9 +965,9 @@ find_next_index_buffer: "has a size (%u) differing from the directory " "specified size (%u).\n", (long long)ia_start >> index_vcn_size_bits, - (unsigned long long)dir_ni->mft_no, + (unsigned long long)dir_ni->mft_no, (unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18, - index_block_size); + (unsigned)index_block_size); goto dir_err_out; } index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length); Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- index.c 19 Jun 2005 21:09:40 -0000 1.5 +++ index.c 21 Jun 2005 09:55:15 -0000 1.6 @@ -1,7 +1,7 @@ /* * index.c - NTFS index handling. Part of the Linux-NTFS project. * - * Copyright (c) 2004 Anton Altaparmakov + * Copyright (c) 2004-2005 Anton Altaparmakov * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or @@ -172,7 +172,7 @@ int ntfs_index_lookup(const void *key, c cr = ir->collation_rule; if (!ntfs_is_collation_rule_supported(cr)) { ntfs_error(sb, "Index uses unsupported collation rule 0x%x. " - "Aborting lookup.", le32_to_cpu(cr)); + "Aborting lookup.", (unsigned)le32_to_cpu(cr)); err = EOPNOTSUPP; goto err_out; } @@ -295,9 +295,9 @@ descend_into_child_node: "a size (%u) differing from the index " "specified size (%u). Inode is corrupt or " "driver bug.", (unsigned long long)vcn, - ni->mft_no, + ni->mft_no, (unsigned) le32_to_cpu(ia->index.allocated_size) + 0x18, - ictx->block_size); + (unsigned)ictx->block_size); goto err_out; } index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length); Index: runlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- runlist.c 20 Jun 2005 14:23:50 -0000 1.50 +++ runlist.c 21 Jun 2005 09:55:15 -0000 1.51 @@ -1,7 +1,7 @@ /* * runlist.c - Run list handling code. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * Copyright (c) 2002 Richard Russon * Copyright (c) 2004 Yura Pakhuchiy * @@ -721,7 +721,7 @@ runlist_element *ntfs_mapping_pairs_deco u8 b; /* Current byte offset in buf. */ Dprintf("%s(): Entering for attr 0x%x.\n", __FUNCTION__, - le32_to_cpu(attr->type)); + (unsigned)le32_to_cpu(attr->type)); /* Make sure attr exists and is non-resident. */ if (!attr || !attr->non_resident || sle64_to_cpu(attr->lowest_vcn) < (VCN)0) { |
