From 3f54a014e5ab7397a146b7062128bc755af08d19 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 21 Sep 2003 21:23:33 +0000
Subject: [PATCH] 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
---
 headers/private/storage/Partition.h |  8 ++++----
 src/kits/storage/Partition.cpp      | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/headers/private/storage/Partition.h b/headers/private/storage/Partition.h
index c68f2be85f..7e4d599870 100644
--- a/headers/private/storage/Partition.h
+++ b/headers/private/storage/Partition.h
@@ -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;
diff --git a/src/kits/storage/Partition.cpp b/src/kits/storage/Partition.cpp
index 0c9bd67480..3e1fdb38d7 100644
--- a/src/kits/storage/Partition.cpp
+++ b/src/kits/storage/Partition.cpp
@@ -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;