[Haiku-commits] r21422 - haiku/trunk/src/add-ons/kernel/file_systems/bfs

[korli at BerliOS]

Author: korli
Date: 2007-06-16 13:33:42 +0200 (Sat, 16 Jun 2007)
New Revision: 21422
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21422&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs.h
Log:
replaced uint32 by addr_t where it applies to please gcc on x86_64


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2007-06-15 21:02:08 UTC (rev 21421)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2007-06-16 11:33:42 UTC (rev 21422)
@@ -1908,7 +1908,7 @@
 			nextOffset = node->OverflowLink();
 		else {
 			if (node->AllKeyLength() > fTree->fNodeSize
-				|| (uint32)node->Values() > (uint32)node + fTree->fNodeSize
+				|| (addr_t)node->Values() > (addr_t)node + fTree->fNodeSize
 					- 8 * node->NumKeys())
 				RETURN_ERROR(B_ERROR);
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp	2007-06-15 21:02:08 UTC (rev 21421)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp	2007-06-16 11:33:42 UTC (rev 21422)
@@ -206,7 +206,7 @@
 		buffer[length] = '\0';
 
 		off_t *value = node->Values() + i;
-		if ((uint32)value < (uint32)node || (uint32)value > (uint32)node + header->node_size)
+		if ((addr_t)value < (addr_t)node || (addr_t)value > (addr_t)node + header->node_size)
 			Print("  %2d. Invalid Offset!!\n", (int)i);
 		else {
 			Print("  %2d. ", (int)i);

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs.h	2007-06-15 21:02:08 UTC (rev 21421)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs.h	2007-06-16 11:33:42 UTC (rev 21422)
@@ -365,7 +365,7 @@
 	// we need to check the location first, because if name_size is already beyond
 	// the block, we would touch invalid memory (although that can't cause wrong
 	// results)
-	return (uint32)this > (uint32)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
+	return (addr_t)this > (addr_t)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
 }
 
 #ifdef _BOOT_MODE