i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UninitializeContents() returns an error code now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4841 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-09-28 19:26:18 +00:00
parent ccb29adbec
commit 69cb08c01c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/disk_device_manager/KPartition.h
+1 -1
View File
@@ -170,7 +170,7 @@ public:
void SetChangeFlags(uint32 flags); void SetChangeFlags(uint32 flags);
uint32 ChangeFlags() const; uint32 ChangeFlags() const;
int32 ChangeCounter() const; int32 ChangeCounter() const;
void UninitializeContents(bool logChanges = true); status_t UninitializeContents(bool logChanges = true);
void SetAlgorithmData(uint32 data); void SetAlgorithmData(uint32 data);
uint32 AlgorithmData() const; uint32 AlgorithmData() const;
src/kernel/core/disk_device_manager/KPartition.cpp
+4 -2
View File
@@ -834,7 +834,7 @@ KPartition::ChangeCounter() const
} }
// UninitializeContents // UninitializeContents
void status_t
KPartition::UninitializeContents(bool logChanges) KPartition::UninitializeContents(bool logChanges)
{ {
if (DiskSystem()) { if (DiskSystem()) {
@@ -844,7 +844,8 @@ KPartition::UninitializeContents(bool logChanges)
| B_PARTITION_CHANGED_FLAGS; | B_PARTITION_CHANGED_FLAGS;
// children // children
if (CountChildren() > 0) { if (CountChildren() > 0) {
RemoveAllChildren(); if (!RemoveAllChildren())
return B_ERROR;
flags |= B_PARTITION_CHANGED_CHILDREN; flags |= B_PARTITION_CHANGED_CHILDREN;
} }
// volume // volume
@@ -890,6 +891,7 @@ KPartition::UninitializeContents(bool logChanges)
| B_PARTITION_CHANGED_REPAIR); | B_PARTITION_CHANGED_REPAIR);
} }
} }
return B_OK;
} }
// SetAlgorithmData // SetAlgorithmData