Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused error reporting from snap_to_*() (#48) 

None of the snap_to_*() methods report any errors so remove the unused
error parameter and return value.

Closes #48 - Error when moving locked LUKS-encrypted partition
This commit is contained in:
Mike Fleetwood 2019-05-09 08:03:16 +01:00 committed by Curtis Gedak
parent 406beaaed0
commit 14aa9276d4
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/GParted_Core.h
View File

@ -50,10 +50,10 @@ public:
void set_devices( std::vector<Device> & devices ) ; void set_devices( std::vector<Device> & devices ) ;
void set_devices_thread( std::vector<Device> * pdevices ); void set_devices_thread( std::vector<Device> * pdevices );
void guess_partition_table(const Device & device, Glib::ustring &buff); void guess_partition_table(const Device & device, Glib::ustring &buff);
bool snap_to_cylinder( const Device & device, Partition & partition, Glib::ustring & error ) ; void snap_to_cylinder(const Device& device, Partition& partition);
bool snap_to_mebibyte( const Device & device, Partition & partition, Glib::ustring & error ) ; void snap_to_mebibyte(const Device& device, Partition& partition);
bool snap_to_alignment( const Device & device, Partition & partition, Glib::ustring & error ) ; void snap_to_alignment(const Device& device, Partition& partition);
bool valid_partition(const Device& device, Partition& partition, Glib::ustring& error); bool valid_partition(const Device& device, Partition& partition, Glib::ustring& error);
bool apply_operation_to_disk( Operation * operation ); bool apply_operation_to_disk( Operation * operation );

25
src/GParted_Core.cc
View File

@ -328,7 +328,8 @@ Glib::ustring GParted_Core::get_thread_status_message( )
return thread_status_message ; return thread_status_message ;
} }
bool GParted_Core::snap_to_cylinder( const Device & device, Partition & partition, Glib::ustring & error )
void GParted_Core::snap_to_cylinder(const Device& device, Partition& partition)
{ {
Sector diff = 0; Sector diff = 0;
@ -374,11 +375,10 @@ bool GParted_Core::snap_to_cylinder( const Device & device, Partition & partitio
else else
partition .sector_end += (device .cylsize - diff ) ; partition .sector_end += (device .cylsize - diff ) ;
} }
return true ;
} }
bool GParted_Core::snap_to_mebibyte( const Device & device, Partition & partition, Glib::ustring & error )
void GParted_Core::snap_to_mebibyte(const Device& device, Partition& partition)
{ {
Sector diff = 0; Sector diff = 0;
if ( partition .sector_start < 2 || partition .type == TYPE_LOGICAL ) if ( partition .sector_start < 2 || partition .type == TYPE_LOGICAL )
@ -532,26 +532,21 @@ bool GParted_Core::snap_to_mebibyte( const Device & device, Partition & partitio
{ {
partition .sector_end -= ( MEBIBYTE / partition .sector_size ) ; partition .sector_end -= ( MEBIBYTE / partition .sector_size ) ;
} }
return true ;
} }
bool GParted_Core::snap_to_alignment( const Device & device, Partition & partition, Glib::ustring & error )
void GParted_Core::snap_to_alignment(const Device& device, Partition& partition)
{ {
bool rc = true ;
if ( partition .alignment == ALIGN_CYLINDER ) if ( partition .alignment == ALIGN_CYLINDER )
rc = snap_to_cylinder( device, partition, error ) ; snap_to_cylinder(device, partition);
else if ( partition .alignment == ALIGN_MEBIBYTE ) else if ( partition .alignment == ALIGN_MEBIBYTE )
rc = snap_to_mebibyte( device, partition, error ) ; snap_to_mebibyte(device, partition);
return rc;
} }
bool GParted_Core::valid_partition(const Device& device, Partition& partition, Glib::ustring& error) bool GParted_Core::valid_partition(const Device& device, Partition& partition, Glib::ustring& error)
{ {
bool rc = snap_to_alignment(device, partition, error); snap_to_alignment(device, partition);
//Ensure that partition start and end are not beyond the ends of the disk device //Ensure that partition start and end are not beyond the ends of the disk device
if ( partition .sector_start < 0 ) if ( partition .sector_start < 0 )
@ -588,7 +583,7 @@ bool GParted_Core::valid_partition(const Device& device, Partition& partition, G
//however, finding the adjacent partitions is not as easy as it seems and at this moment all the dialogs //however, finding the adjacent partitions is not as easy as it seems and at this moment all the dialogs
//already perform these checks. A perfect 'fixme-later' ;) //already perform these checks. A perfect 'fixme-later' ;)
return rc ; return true;
} }
bool GParted_Core::apply_operation_to_disk( Operation * operation ) bool GParted_Core::apply_operation_to_disk( Operation * operation )