From 89264fe471f64cfa6ea0e3078d56a1cc9727b91f Mon Sep 17 00:00:00 2001
From: Salvatore Benedetto <salvatore.benedetto@gmail.com>
Date: Fri, 22 Aug 2008 09:59:01 +0000
Subject: [PATCH] * Improve debug output. No functional changes.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27137 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/file_systems/udf/PhysicalPartition.cpp        | 9 +++++----
 src/add-ons/kernel/file_systems/udf/Utils.cpp            | 3 ++-
 src/add-ons/kernel/file_systems/udf/Volume.cpp           | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp b/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
index f1ad593d04..eadf9ad122 100644
--- a/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
@@ -27,14 +27,15 @@ PhysicalPartition::~PhysicalPartition()
 status_t
 PhysicalPartition::MapBlock(uint32 logicalBlock, off_t &physicalBlock)
 {
-	TRACE(("PhysicalPartition::MapBlock: %ld", logicalBlock));
+	TRACE(("PhysicalPartition::MapBlock: %ld\n", logicalBlock));
 	if (logicalBlock >= fLength) {
-		TRACE_ERROR(("invalid logical block: %ld, length: %ld\n",
-			logicalBlock, fLength));
+		TRACE_ERROR(("PhysicalPartition::MapBlock: block %ld invalid,
+			length = %ld\n", logicalBlock, fLength));
 		return B_BAD_ADDRESS;
 	} else {
 		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;
 	}
 }
diff --git a/src/add-ons/kernel/file_systems/udf/Utils.cpp b/src/add-ons/kernel/file_systems/udf/Utils.cpp
index 4fc04cfe0f..e027f2e152 100644
--- a/src/add-ons/kernel/file_systems/udf/Utils.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Utils.cpp
@@ -137,7 +137,8 @@ make_time(timestamp &timestamp)
 long_address
 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;
 	result.set_block((id >> 16) & 0xffffffff);
 	result.set_partition(id & 0xffff);
diff --git a/src/add-ons/kernel/file_systems/udf/Volume.cpp b/src/add-ons/kernel/file_systems/udf/Volume.cpp
index 50cf37e05a..2b917cc4aa 100644
--- a/src/add-ons/kernel/file_systems/udf/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Volume.cpp
@@ -139,7 +139,7 @@ Volume::Mount(const char *deviceName, off_t offset, off_t length,
 						physicalCount++;
 				}
 			} else {
-				TRACE(("no matching partition descriptor found!\n"));
+				TRACE_ERROR(("Volume::Mount: no matching partition descriptor found!\n"));
 				status = B_ERROR;
 			}
 		} else if (header->type() == 2) {
@@ -204,7 +204,9 @@ Volume::Mount(const char *deviceName, off_t offset, off_t length,
 		fBlockSize = blockSize;
 		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
 	// our partitions are all set up. We now need to investigate the file
 	// set descriptor pointed to by the logical volume descriptor.