replaced uint32 by addr_t where it applies to please gcc on x86_64
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21422 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1908,7 +1908,7 @@ TreeIterator::Goto(int8 to)
|
|||||||
nextOffset = node->OverflowLink();
|
nextOffset = node->OverflowLink();
|
||||||
else {
|
else {
|
||||||
if (node->AllKeyLength() > fTree->fNodeSize
|
if (node->AllKeyLength() > fTree->fNodeSize
|
||||||
|| (uint32)node->Values() > (uint32)node + fTree->fNodeSize
|
|| (addr_t)node->Values() > (addr_t)node + fTree->fNodeSize
|
||||||
- 8 * node->NumKeys())
|
- 8 * node->NumKeys())
|
||||||
RETURN_ERROR(B_ERROR);
|
RETURN_ERROR(B_ERROR);
|
||||||
|
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ dump_bplustree_node(const bplustree_node *node, const bplustree_header *header,
|
|||||||
buffer[length] = '\0';
|
buffer[length] = '\0';
|
||||||
|
|
||||||
off_t *value = node->Values() + i;
|
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);
|
Print(" %2d. Invalid Offset!!\n", (int)i);
|
||||||
else {
|
else {
|
||||||
Print(" %2d. ", (int)i);
|
Print(" %2d. ", (int)i);
|
||||||
|
|||||||
@@ -365,7 +365,7 @@ small_data::IsLast(const bfs_inode *inode) const
|
|||||||
// we need to check the location first, because if name_size is already beyond
|
// 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
|
// the block, we would touch invalid memory (although that can't cause wrong
|
||||||
// results)
|
// 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
|
#ifdef _BOOT_MODE
|
||||||
|
|||||||
Reference in New Issue
Block a user