Removed the resizeContents/force parameters from [Validate]Resize()/[Validate]Move() as discussed in July (grrr, I was lazy).
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4782 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
dafaf4c360
commit
3f54a014e5
@ -79,13 +79,13 @@ public:
|
||||
|
||||
bool CanResize(bool *canResizeContents = NULL,
|
||||
bool *whileMounted = NULL) const;
|
||||
status_t ValidateResize(off_t *size, bool resizeContents = true) const;
|
||||
status_t Resize(off_t size, bool resizeContents = true);
|
||||
status_t ValidateResize(off_t *size) const;
|
||||
status_t Resize(off_t size);
|
||||
|
||||
bool CanMove(BObjectList<BPartition> *unmovableDescendants = NULL,
|
||||
BObjectList<BPartition> *movableOnlyIfUnmounted = NULL) const;
|
||||
status_t ValidateMove(off_t *newOffset, bool force = false) const;
|
||||
status_t Move(off_t newOffset, bool force = false);
|
||||
status_t ValidateMove(off_t *newOffset) const;
|
||||
status_t Move(off_t newOffset);
|
||||
|
||||
bool CanSetName() const;
|
||||
status_t ValidateSetName(char *name) const;
|
||||
|
@ -518,22 +518,22 @@ BPartition::CanResize(bool *canResizeContents, bool *whileMounted) const
|
||||
|
||||
// ValidateResize
|
||||
status_t
|
||||
BPartition::ValidateResize(off_t *size, bool resizeContents) const
|
||||
BPartition::ValidateResize(off_t *size) const
|
||||
{
|
||||
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow() || !size)
|
||||
return B_BAD_VALUE;
|
||||
return _kern_validate_resize_partition(_ShadowID(), _ChangeCounter(), size,
|
||||
resizeContents);
|
||||
return _kern_validate_resize_partition(_ShadowID(), _ChangeCounter(),
|
||||
size);
|
||||
}
|
||||
|
||||
// Resize
|
||||
status_t
|
||||
BPartition::Resize(off_t size, bool resizeContents)
|
||||
BPartition::Resize(off_t size)
|
||||
{
|
||||
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow())
|
||||
return B_BAD_VALUE;
|
||||
status_t error = _kern_resize_partition(_ShadowID(), _ChangeCounter(),
|
||||
size, resizeContents);
|
||||
size);
|
||||
if (error == B_OK)
|
||||
error = Device()->Update();
|
||||
return error;
|
||||
@ -597,24 +597,24 @@ BPartition::CanMove(BObjectList<BPartition> *unmovableDescendants,
|
||||
|
||||
// ValidateMove
|
||||
status_t
|
||||
BPartition::ValidateMove(off_t *newOffset, bool force) const
|
||||
BPartition::ValidateMove(off_t *newOffset) const
|
||||
{
|
||||
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow()
|
||||
|| !newOffset) {
|
||||
return B_BAD_VALUE;
|
||||
}
|
||||
return _kern_validate_move_partition(_ShadowID(), _ChangeCounter(),
|
||||
newOffset, force);
|
||||
newOffset);
|
||||
}
|
||||
|
||||
// Move
|
||||
status_t
|
||||
BPartition::Move(off_t newOffset, bool force)
|
||||
BPartition::Move(off_t newOffset)
|
||||
{
|
||||
if (!fPartitionData || IsDevice() || !Parent() || !_IsShadow())
|
||||
return B_BAD_VALUE;
|
||||
status_t error = _kern_resize_partition(_ShadowID(), _ChangeCounter(),
|
||||
newOffset, force);
|
||||
newOffset);
|
||||
if (error == B_OK)
|
||||
error = Device()->Update();
|
||||
return error;
|
||||
|
Loading…
Reference in New Issue
Block a user