From f1143621cac203ab3c7da3715e7c2f06c131cfe6 Mon Sep 17 00:00:00 2001 From: Wim van der Meer Date: Sun, 27 Jun 2010 05:49:19 +0000 Subject: [PATCH] Compiler warning fixes. No functional change. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37270 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../disk_systems/intel/ExtendedPartitionAddOn.cpp | 10 +++++----- src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp index bd9835c5ca..eeceeabda3 100644 --- a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp +++ b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp @@ -114,7 +114,7 @@ ExtendedPartitionAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) { if (!CanInitialize(partition) - || parameters != NULL && strlen(parameters) > 0) { + || (parameters != NULL && strlen(parameters) > 0)) { return B_BAD_VALUE; } @@ -132,8 +132,8 @@ ExtendedPartitionAddOn::Initialize(BMutablePartition* partition, const char* name, const char* parameters, BPartitionHandle** _handle) { if (!CanInitialize(partition) - || name != NULL && strlen(name) > 0 - || parameters != NULL && strlen(parameters) > 0) { + || (name != NULL && strlen(name) > 0) + || (parameters != NULL && strlen(parameters) > 0)) { return B_BAD_VALUE; } @@ -374,8 +374,8 @@ ExtendedPartitionHandle::ValidateCreateChild(off_t* _offset, off_t* _size, info.GetPartitionableSpaceAt(i, &spaceOffset, &spaceSize); off_t spaceEnd = spaceOffset + spaceSize; - if (spaceOffset >= offset && spaceOffset < end - || offset >= spaceOffset && offset < spaceEnd) { + if ((spaceOffset >= offset && spaceOffset < end) + || (offset >= spaceOffset && offset < spaceEnd)) { spaceIndex = i; break; } diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index 9eda8017db..1d59c5cf3e 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -114,7 +114,7 @@ PartitionMapAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) { if (!CanInitialize(partition) - || parameters != NULL && strlen(parameters) > 0) { + || (parameters != NULL && strlen(parameters) > 0)) { return B_BAD_VALUE; } @@ -132,8 +132,8 @@ PartitionMapAddOn::Initialize(BMutablePartition* partition, const char* name, const char* parameters, BPartitionHandle** _handle) { if (!CanInitialize(partition) - || name != NULL && strlen(name) > 0 - || parameters != NULL && strlen(parameters) > 0) { + || (name != NULL && strlen(name) > 0) + || (parameters != NULL && strlen(parameters) > 0)) { return B_BAD_VALUE; } @@ -382,8 +382,8 @@ PartitionMapHandle::ValidateCreateChild(off_t* _offset, off_t* _size, info.GetPartitionableSpaceAt(i, &spaceOffset, &spaceSize); off_t spaceEnd = spaceOffset + spaceSize; - if (spaceOffset >= offset && spaceOffset < end - || offset >= spaceOffset && offset < spaceEnd) { + if ((spaceOffset >= offset && spaceOffset < end) + || (offset >= spaceOffset && offset < spaceEnd)) { spaceIndex = i; break; }