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

Removed the resizeContents/force parameters from [Validate]Resize()/[Validate]Move() as discussed in July (grrr, I was lazy).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4782 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-09-21 21:23:33 +00:00
parent dafaf4c360
commit 3f54a014e5
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/storage/Partition.h
+4 -4
View File
@@ -79,13 +79,13 @@ public:
bool CanResize(bool *canResizeContents = NULL, bool CanResize(bool *canResizeContents = NULL,
bool *whileMounted = NULL) const; bool *whileMounted = NULL) const;
status_t ValidateResize(off_t *size, bool resizeContents = true) const; status_t ValidateResize(off_t *size) const;
status_t Resize(off_t size, bool resizeContents = true); status_t Resize(off_t size);
bool CanMove(BObjectList<BPartition> *unmovableDescendants = NULL, bool CanMove(BObjectList<BPartition> *unmovableDescendants = NULL,
BObjectList<BPartition> *movableOnlyIfUnmounted = NULL) const; BObjectList<BPartition> *movableOnlyIfUnmounted = NULL) const;
status_t ValidateMove(off_t *newOffset, bool force = false) const; status_t ValidateMove(off_t *newOffset) const;
status_t Move(off_t newOffset, bool force = false); status_t Move(off_t newOffset);
bool CanSetName() const; bool CanSetName() const;
status_t ValidateSetName(char *name) const; status_t ValidateSetName(char *name) const;
src/kits/storage/Partition.cpp
+9 -9
View File
@@ -518,22 +518,22 @@ BPartition::CanResize(bool *canResizeContents, bool *whileMounted) const
// ValidateResize // ValidateResize
status_t status_t
BPartition::ValidateResize(off_t *size, bool resizeContents) const BPartition::ValidateResize(off_t *size) const
{ {
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow() || !size) if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow() || !size)
return B_BAD_VALUE; return B_BAD_VALUE;
return _kern_validate_resize_partition(_ShadowID(), _ChangeCounter(), size, return _kern_validate_resize_partition(_ShadowID(), _ChangeCounter(),
resizeContents); size);
} }
// Resize // Resize
status_t status_t
BPartition::Resize(off_t size, bool resizeContents) BPartition::Resize(off_t size)
{ {
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow()) if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow())
return B_BAD_VALUE; return B_BAD_VALUE;
status_t error = _kern_resize_partition(_ShadowID(), _ChangeCounter(), status_t error = _kern_resize_partition(_ShadowID(), _ChangeCounter(),
size, resizeContents); size);
if (error == B_OK) if (error == B_OK)
error = Device()->Update(); error = Device()->Update();
return error; return error;
@@ -597,24 +597,24 @@ BPartition::CanMove(BObjectList<BPartition> *unmovableDescendants,
// ValidateMove // ValidateMove
status_t status_t
BPartition::ValidateMove(off_t *newOffset, bool force) const BPartition::ValidateMove(off_t *newOffset) const
{ {
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow() if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow()
|| !newOffset) { || !newOffset) {
return B_BAD_VALUE; return B_BAD_VALUE;
} }
return _kern_validate_move_partition(_ShadowID(), _ChangeCounter(), return _kern_validate_move_partition(_ShadowID(), _ChangeCounter(),
newOffset, force); newOffset);
} }
// Move // Move
status_t status_t
BPartition::Move(off_t newOffset, bool force) BPartition::Move(off_t newOffset)
{ {
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow()) if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow())
return B_BAD_VALUE; return B_BAD_VALUE;
status_t error = _kern_resize_partition(_ShadowID(), _ChangeCounter(), status_t error = _kern_resize_partition(_ShadowID(), _ChangeCounter(),
newOffset, force); newOffset);
if (error == B_OK) if (error == B_OK)
error = Device()->Update(); error = Device()->Update();
return error; return error;