From 070bba8608738b445f53100761dfef5dfe729eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 17 Sep 2003 01:02:26 +0000 Subject: [PATCH] The partition-is-big-enough-for-child test did not work correctly; the partition offset doesn't belong there (caused it to hide nested partitions) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4718 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp | 3 +-- src/add-ons/kernel/partitioning_systems/apple/apple.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp b/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp index 00bda2cd5f..bff002c785 100644 --- a/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp +++ b/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp @@ -180,8 +180,7 @@ amiga_rdb_scan_partition(int fd, partition_data *partition, void *_cookie) disk_environment &environment = *(disk_environment *)&partitionBlock.environment[0]; TRACE(("amiga_rdb: file system: %s\n", get_tupel(B_BENDIAN_TO_HOST_INT32(environment.dos_type)))); - if ((uint64)partition->offset + environment.Start() - + environment.Size() > (uint64)partition->size) { + if (environment.Start() + environment.Size() > (uint64)partition->size) { TRACE(("amiga_rdb: child partition exceeds existing space (%Ld bytes)\n", environment.Size())); continue; } diff --git a/src/add-ons/kernel/partitioning_systems/apple/apple.cpp b/src/add-ons/kernel/partitioning_systems/apple/apple.cpp index cf11978a7f..5562411cd4 100644 --- a/src/add-ons/kernel/partitioning_systems/apple/apple.cpp +++ b/src/add-ons/kernel/partitioning_systems/apple/apple.cpp @@ -157,8 +157,7 @@ apple_scan_partition(int fd, partition_data *partition, void *_cookie) TRACE(("apple: found partition: name = \"%s\", type = \"%s\"\n", partitionMap.name, partitionMap.type)); - if ((uint64)partition->offset + partitionMap.Start(descriptor) - + partitionMap.Size(descriptor) > (uint64)partition->size) { + if (partitionMap.Start(descriptor) + partitionMap.Size(descriptor) > (uint64)partition->size) { TRACE(("apple: child partition exceeds existing space (%Ld bytes)\n", partitionMap.Size(descriptor))); continue;