mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-24 02:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

80 chars lines long fixes

Browse Source
This commit is contained in:
yura 2006-11-19 20:19:18 +00:00
parent b33658bc61
commit f7fe727b09
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libntfs/bootsect.c
View File

@ -56,7 +56,8 @@
*
* Return TRUE if @b contains a valid ntfs boot sector and FALSE if not.
*/
BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_SECTOR *b, const BOOL silent __attribute__((unused)))
BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_SECTOR *b,
const BOOL silent __attribute__((unused)))
{
u32 i;
@ -148,10 +149,10 @@ BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_SECTOR *b, const BOOL silent __attribute
ntfs_log_debug("OK\n");
if (b->end_of_sector_marker != cpu_to_le16(0xaa55))
ntfs_log_debug("Warning: Bootsector has invalid end of sector marker.\n");
ntfs_log_debug("Warning: Bootsector has invalid end of sector "
"marker.\n");
ntfs_log_debug("Bootsector check completed successfully.\n");
return TRUE;
not_ntfs:
ntfs_log_debug("FAILED\n");
@ -187,7 +188,8 @@ int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
* ntfs_boot_sector_is_ntfs but in this way we can just do this once.
*/
sectors_per_cluster = bs->bpb.sectors_per_cluster;
ntfs_log_debug("NumberOfSectors = %lli\n", sle64_to_cpu(bs->number_of_sectors));
ntfs_log_debug("NumberOfSectors = %lli\n",
sle64_to_cpu(bs->number_of_sectors));
ntfs_log_debug("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
if (sectors_per_cluster & (sectors_per_cluster - 1)) {
ntfs_log_debug("Error: %s is not a valid NTFS partition! "
@ -244,7 +246,8 @@ int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
return -1;
}
vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1;
ntfs_log_debug("MftRecordSize = 0x%x\n", (unsigned)vol->mft_record_size);
ntfs_log_debug("MftRecordSize = 0x%x\n",
(unsigned)vol->mft_record_size);
ntfs_log_debug("MftRecordSizeBits = %u\n", vol->mft_record_size_bits);
/* Same as above for INDX record. */
c = bs->clusters_per_index_record;
@ -254,7 +257,8 @@ int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
else
vol->indx_record_size = c << vol->cluster_size_bits;
vol->indx_record_size_bits = ffs(vol->indx_record_size) - 1;
ntfs_log_debug("INDXRecordSize = 0x%x\n", (unsigned)vol->indx_record_size);
ntfs_log_debug("INDXRecordSize = 0x%x\n",
(unsigned)vol->indx_record_size);
ntfs_log_debug("INDXRecordSizeBits = %u\n", vol->indx_record_size_bits);
/*
* Work out the size of the MFT mirror in number of mft records. If the

7
libntfs/volume.c
View File

@ -457,8 +457,8 @@ ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev,
if (br != -1)
errno = EINVAL;
if (!br)
ntfs_log_debug("Error: partition is smaller than bootsector "
"size. Weird!\n");
ntfs_log_debug("Error: partition is smaller than "
"bootsector size. Weird!\n");
else
ntfs_log_perror("Error reading bootsector");
goto error_exit;
@ -528,7 +528,8 @@ ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev,
vol->cluster_size;
if (vol->mft_zone_start <= mft_lcn)
vol->mft_zone_start = 0;
ntfs_log_debug("mft_zone_start = 0x%llx\n", (long long)vol->mft_zone_start);
ntfs_log_debug("mft_zone_start = 0x%llx\n",
(long long)vol->mft_zone_start);
/*
* Need to cap the mft zone on non-standard volumes so that it does