From 707fa510227bc9dc9931a951bc88605c8de71537 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 24 Feb 2003 00:39:27 +0000 Subject: [PATCH] Fixed return type of read_partition_map (status_t -> bool). Fixed PartitionMapParser::Parse(): It wrongly error checked for a NULL block, which is allowed. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2819 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/disk_scanner/partition/intel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/disk_scanner/partition/intel.cpp b/src/add-ons/kernel/disk_scanner/partition/intel.cpp index 716070d9b9..4953388300 100644 --- a/src/add-ons/kernel/disk_scanner/partition/intel.cpp +++ b/src/add-ons/kernel/disk_scanner/partition/intel.cpp @@ -85,7 +85,7 @@ PartitionMapParser::~PartitionMapParser() status_t PartitionMapParser::Parse(const uint8 *block, PartitionMap *map) { - status_t error = (block && map ? B_OK : B_BAD_VALUE); + status_t error = (map ? B_OK : B_BAD_VALUE); if (error == B_OK) { fMap = map; fMap->Unset(); @@ -277,7 +277,7 @@ std_ops(int32 op, ...) // read_partition_map static -status_t +bool read_partition_map(int deviceFD, const session_info *sessionInfo, const uchar *block, PartitionMap *map) {