[gparted] Rename copy_filesystem() methods (#775932)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Rename copy_filesystem() methods (#775932)
- Date: Wed, 14 Dec 2016 21:12:17 +0000 (UTC)
commit fd56d7be5782d4c06221d76dcc1f0d2536a65688
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Fri Nov 4 13:45:50 2016 +0000
Rename copy_filesystem() methods (#775932)
Rename GParted_Core methods:
copy_filesystem(4 params) -> copy_filesystem_internal()
copy_filesystem(5 params) -> copy_filesystem_internal()
copy_filesystem(10 params) -> copy_blocks()
See the following commit for the desire to do this.
Bug 775932 - Refactor mostly applying of operations
include/GParted_Core.h | 38 ++++++++--------
src/GParted_Core.cc | 110 +++++++++++++++++++++++++----------------------
2 files changed, 77 insertions(+), 71 deletions(-)
---
diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index bf2a780..4829737 100644
--- a/include/GParted_Core.h
+++ b/include/GParted_Core.h
@@ -149,25 +149,25 @@ private:
Partition & partition_dst,
Byte_Value min_size,
OperationDetail & operationdetail ) ;
- bool copy_filesystem( const Partition & partition_src,
- const Partition & partition_dst,
- OperationDetail & operationdetail,
- bool cancel_safe );
- bool copy_filesystem( const Partition & partition_src,
- const Partition & partition_dst,
- OperationDetail & operationdetail,
- Byte_Value & total_done,
- bool cancel_safe );
- bool copy_filesystem( const Glib::ustring & src_device,
- const Glib::ustring & dst_device,
- Sector src_start,
- Sector dst_start,
- Byte_Value src_sector_size,
- Byte_Value dst_sector_size,
- Byte_Value src_length,
- OperationDetail & operationdetail,
- Byte_Value & total_done,
- bool cancel_safe ) ;
+ bool copy_filesystem_internal( const Partition & partition_src,
+ const Partition & partition_dst,
+ OperationDetail & operationdetail,
+ bool cancel_safe );
+ bool copy_filesystem_internal( const Partition & partition_src,
+ const Partition & partition_dst,
+ OperationDetail & operationdetail,
+ Byte_Value & total_done,
+ bool cancel_safe );
+ bool copy_blocks( const Glib::ustring & src_device,
+ const Glib::ustring & dst_device,
+ Sector src_start,
+ Sector dst_start,
+ Byte_Value src_sector_size,
+ Byte_Value dst_sector_size,
+ Byte_Value src_length,
+ OperationDetail & operationdetail,
+ Byte_Value & total_done,
+ bool cancel_safe );
void rollback_transaction( const Partition & partition_src,
const Partition & partition_dst,
OperationDetail & operationdetail,
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 55cd52d..360f3c9 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -2394,11 +2394,11 @@ bool GParted_Core::move_filesystem( const Partition & partition_old,
succes = false ;
if ( partition_new .test_overlap( partition_old ) )
{
- succes = copy_filesystem( partition_old,
- partition_new,
- operationdetail.get_last_child(),
- total_done,
- true );
+ succes = copy_filesystem_internal( partition_old,
+ partition_new,
+ operationdetail.get_last_child(),
+ total_done,
+ true );
operationdetail.get_last_child().get_last_child()
.set_status( succes ? STATUS_SUCCES : STATUS_ERROR );
@@ -2411,8 +2411,11 @@ bool GParted_Core::move_filesystem( const Partition & partition_old,
}
}
else
- succes = copy_filesystem( partition_old, partition_new, operationdetail
.get_last_child(),
- total_done, true ) ;
+ succes = copy_filesystem_internal( partition_old,
+ partition_new,
+ operationdetail.get_last_child(),
+ total_done,
+ true );
break ;
case GParted::FS::LIBPARTED:
@@ -2874,10 +2877,10 @@ bool GParted_Core::copy( const Partition & partition_src,
switch ( get_fs( partition_dst .filesystem ) .copy )
{
case GParted::FS::GPARTED :
- succes = copy_filesystem( partition_src,
- partition_dst,
- operationdetail .get_last_child(),
- true ) ;
+ succes = copy_filesystem_internal( partition_src,
+ partition_dst,
+
operationdetail.get_last_child(),
+ true );
break ;
case GParted::FS::LIBPARTED :
@@ -2915,52 +2918,52 @@ bool GParted_Core::copy( const Partition & partition_src,
return false ;
}
-bool GParted_Core::copy_filesystem( const Partition & partition_src,
- const Partition & partition_dst,
- OperationDetail & operationdetail,
- bool cancel_safe )
+bool GParted_Core::copy_filesystem_internal( const Partition & partition_src,
+ const Partition & partition_dst,
+ OperationDetail & operationdetail,
+ bool cancel_safe )
{
Sector dummy ;
- return copy_filesystem( partition_src .device_path,
- partition_dst .device_path,
- partition_src .sector_start,
- partition_dst .sector_start,
- partition_src .sector_size,
- partition_dst .sector_size,
- partition_src .get_byte_length(),
- operationdetail,
- dummy,
- cancel_safe ) ;
-}
-
-bool GParted_Core::copy_filesystem( const Partition & partition_src,
- const Partition & partition_dst,
- OperationDetail & operationdetail,
- Byte_Value & total_done,
- bool cancel_safe )
-{
- return copy_filesystem( partition_src .device_path,
- partition_dst .device_path,
- partition_src .sector_start,
- partition_dst .sector_start,
- partition_src .sector_size,
- partition_dst .sector_size,
- partition_src .get_byte_length(),
- operationdetail,
- total_done,
- cancel_safe ) ;
+ return copy_blocks( partition_src.device_path,
+ partition_dst.device_path,
+ partition_src.sector_start,
+ partition_dst.sector_start,
+ partition_src.sector_size,
+ partition_dst.sector_size,
+ partition_src.get_byte_length(),
+ operationdetail,
+ dummy,
+ cancel_safe );
+}
+
+bool GParted_Core::copy_filesystem_internal( const Partition & partition_src,
+ const Partition & partition_dst,
+ OperationDetail & operationdetail,
+ Byte_Value & total_done,
+ bool cancel_safe )
+{
+ return copy_blocks( partition_src.device_path,
+ partition_dst.device_path,
+ partition_src.sector_start,
+ partition_dst.sector_start,
+ partition_src.sector_size,
+ partition_dst.sector_size,
+ partition_src.get_byte_length(),
+ operationdetail,
+ total_done,
+ cancel_safe );
}
-bool GParted_Core::copy_filesystem( const Glib::ustring & src_device,
- const Glib::ustring & dst_device,
- Sector src_start,
- Sector dst_start,
- Byte_Value src_sector_size,
- Byte_Value dst_sector_size,
- Byte_Value src_length,
- OperationDetail & operationdetail,
- Byte_Value & total_done,
- bool cancel_safe )
+bool GParted_Core::copy_blocks( const Glib::ustring & src_device,
+ const Glib::ustring & dst_device,
+ Sector src_start,
+ Sector dst_start,
+ Byte_Value src_sector_size,
+ Byte_Value dst_sector_size,
+ Byte_Value src_length,
+ OperationDetail & operationdetail,
+ Byte_Value & total_done,
+ bool cancel_safe )
{
operationdetail .add_child( OperationDetail( _("using internal algorithm"), STATUS_NONE ) ) ;
operationdetail .add_child( OperationDetail(
@@ -3087,7 +3090,10 @@ void GParted_Core::rollback_transaction( const Partition & partition_src,
operationdetail.add_child( OperationDetail( _("roll back last transaction") ) );
//and copy it back (NOTE the reversed dst and src)
- bool success = copy_filesystem( *temp_dst, *temp_src,
operationdetail.get_last_child(), false );
+ bool success = copy_filesystem_internal( *temp_dst,
+ *temp_src,
+ operationdetail.get_last_child(),
+ false );
operationdetail.get_last_child().set_status( success ? STATUS_SUCCES : STATUS_ERROR );
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
