From b1477985ef52d4728aebde8b3ff20661b55a9e21 Mon Sep 17 00:00:00 2001 From: Wim van der Meer Date: Wed, 30 Jun 2010 12:56:34 +0000 Subject: [PATCH] Add parentheses to get rid of 'suggest parentheses around && within ||' warnings. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37311 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/partitioning_systems/intel/write_support.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp index 4f357c4279..ed397180d7 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp +++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp @@ -1723,8 +1723,8 @@ check_partition_location_ep(partition_data* partition, off_t offset, // partition does not lie within extended partition if (offset < partition->offset - || offset > partition->offset + partition->size - && offset + size <= partition->offset + partition->size) + || (offset > partition->offset + partition->size + && offset + size <= partition->offset + partition->size)) return false; // check if the new partition table is within an existing partition @@ -1738,8 +1738,8 @@ check_partition_location_ep(partition_data* partition, off_t offset, if (ptsOffset > logical->Offset() && ptsOffset < logical->Offset() + logical->Size()) return false; - if (logical->PartitionTableOffset() >= offset - && logical->PartitionTableOffset() < offset + size + if ((logical->PartitionTableOffset() >= offset + && logical->PartitionTableOffset() < offset + size) || logical->PartitionTableOffset() == ptsOffset) return false; }