* Improve debug output. No functional changes.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27137 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-08-22 09:59:01 +00:00
parent 5a123e3591
commit 89264fe471
3 changed files with 11 additions and 7 deletions
@@ -27,14 +27,15 @@ PhysicalPartition::~PhysicalPartition()
status_t status_t
PhysicalPartition::MapBlock(uint32 logicalBlock, off_t &physicalBlock) PhysicalPartition::MapBlock(uint32 logicalBlock, off_t &physicalBlock)
{ {
TRACE(("PhysicalPartition::MapBlock: %ld", logicalBlock)); TRACE(("PhysicalPartition::MapBlock: %ld\n", logicalBlock));
if (logicalBlock >= fLength) { if (logicalBlock >= fLength) {
TRACE_ERROR(("invalid logical block: %ld, length: %ld\n", TRACE_ERROR(("PhysicalPartition::MapBlock: block %ld invalid,
logicalBlock, fLength)); length = %ld\n", logicalBlock, fLength));
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
} else { } else {
physicalBlock = fStart + logicalBlock; physicalBlock = fStart + logicalBlock;
TRACE(("mapped %ld to %Ld\n", logicalBlock, physicalBlock)); TRACE(("PhysicalPartition::MapBlock: block %ld mapped to %Ld\n",
logicalBlock, physicalBlock));
return B_OK; return B_OK;
} }
} }
@@ -137,7 +137,8 @@ make_time(timestamp &timestamp)
long_address long_address
to_long_address(ino_t id, uint32 length) to_long_address(ino_t id, uint32 length)
{ {
DEBUG_INIT_ETC(NULL, ("ino_t: %Ld (0x%Lx), length: %ld", id, id, length)); TRACE(("udf_to_long_address: ino_t = %Ld (0x%Lx), length = %ld",
id, id, length));
long_address result; long_address result;
result.set_block((id >> 16) & 0xffffffff); result.set_block((id >> 16) & 0xffffffff);
result.set_partition(id & 0xffff); result.set_partition(id & 0xffff);
@@ -139,7 +139,7 @@ Volume::Mount(const char *deviceName, off_t offset, off_t length,
physicalCount++; physicalCount++;
} }
} else { } else {
TRACE(("no matching partition descriptor found!\n")); TRACE_ERROR(("Volume::Mount: no matching partition descriptor found!\n"));
status = B_ERROR; status = B_ERROR;
} }
} else if (header->type() == 2) { } else if (header->type() == 2) {
@@ -204,7 +204,9 @@ Volume::Mount(const char *deviceName, off_t offset, off_t length,
fBlockSize = blockSize; fBlockSize = blockSize;
fBlockShift = blockShift; fBlockShift = blockShift;
} }
TRACE(("Volume::Mount: device = %d, offset = %d, length = %ld, "
"blockSize = %d, blockShift = %d\n", device, offset, length,
blockSize, blockShift));
// At this point we've found a valid set of volume descriptors and // At this point we've found a valid set of volume descriptors and
// our partitions are all set up. We now need to investigate the file // our partitions are all set up. We now need to investigate the file
// set descriptor pointed to by the logical volume descriptor. // set descriptor pointed to by the logical volume descriptor.