gnome/gparted
gnome/gparted
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gparted synced 2024-09-19 07:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace Operation class members index and index_extended with local variables (#755214)

Browse source 
These member variables store no Operation class information and were
being used as local variables.  Replace with local variables.

Also indent a code block within an if clause so that the compiler can
confirm that the new local variable isn't used uninitialised.  Prevents
this compiler warning:
    OperationResizeMove.cc: In member function 'void GParted::OperationResizeMove::apply_normal_to_visual(std::vector<GParted::Partition, std::allocator<GParted::Partition> >&)':
    OperationResizeMove.cc:125: warning: 'index' may be used uninitialized in this function

Bug 755214 - Refactor operation merging
This commit is contained in:
Mike Fleetwood 2015-09-27 09:30:13 +01:00 committed by Curtis Gedak
parent a1ab21285b
commit cbfb7e51f5
4 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/Operation.h
View file

@ -65,9 +65,6 @@ protected:
void insert_unallocated( std::vector<Partition> & partitions, Sector start, Sector end, Byte_Value sector_size, bool inside_extended );
void substitute_new( std::vector<Partition> & partitions );
void insert_new( std::vector<Partition> & partitions );
int index ;
int index_extended ;
};
} //GParted

6
src/Operation.cc
View file

@ -110,6 +110,9 @@ void Operation::insert_unallocated( std::vector<Partition> & partitions, Sector
// it with this operation's new partition.
void Operation::substitute_new( std::vector<Partition> & partitions )
{
int index_extended;
int index;
if ( partition_original.inside_extended )
{
index_extended = find_index_extended( partitions );
@ -140,6 +143,9 @@ void Operation::insert_new( std::vector<Partition> & partitions )
// on disk. Therefore they match the original partition when visually re-applying
// their operations to the disk graphic. Hence their use of,
// find_index_original().
int index_extended;
int index;
if ( partition_new.inside_extended )
{
index_extended = find_index_extended( partitions );

3
src/OperationDelete.cc
View file

@ -30,6 +30,9 @@ OperationDelete::OperationDelete( const Device & device, const Partition & parti
void OperationDelete::apply_to_visual( std::vector<Partition> & partitions )
{
int index_extended;
int index;
if ( partition_original .inside_extended )
{
index_extended = find_index_extended( partitions ) ;

29
src/OperationResizeMove.cc
View file

@ -33,8 +33,6 @@ OperationResizeMove::OperationResizeMove( const Device & device,
void OperationResizeMove::apply_to_visual( std::vector<Partition> & partitions )
{
index = index_extended = -1 ;
if ( partition_original .type == GParted::TYPE_EXTENDED )
apply_extended_to_visual( partitions ) ;
else
@ -123,23 +121,28 @@ void OperationResizeMove::create_description()
void OperationResizeMove::apply_normal_to_visual( std::vector<Partition> & partitions )
{
int index_extended;
int index;
if ( partition_original .inside_extended )
{
index_extended = find_index_extended( partitions ) ;
if ( index_extended >= 0 )
index = find_index_original( partitions[ index_extended ] .logicals ) ;
if ( index >= 0 )
{
partitions[ index_extended ] .logicals[ index ] = partition_new ;
remove_adjacent_unallocated( partitions[ index_extended ] .logicals, index ) ;
index = find_index_original( partitions[ index_extended ] .logicals ) ;
insert_unallocated( partitions[ index_extended ] .logicals,
partitions[ index_extended ] .sector_start,
partitions[ index_extended ] .sector_end,
device .sector_size,
true ) ;
if ( index >= 0 )
{
partitions[index_extended].logicals[index] = partition_new;
remove_adjacent_unallocated( partitions[index_extended].logicals, index );
insert_unallocated( partitions[index_extended].logicals,
partitions[index_extended].sector_start,
partitions[index_extended].sector_end,
device.sector_size,
true );
}
}
}
else
@ -158,6 +161,8 @@ void OperationResizeMove::apply_normal_to_visual( std::vector<Partition> & parti
void OperationResizeMove::apply_extended_to_visual( std::vector<Partition> & partitions )
{
int index_extended;
//stuff OUTSIDE extended partition
index_extended = find_index_extended( partitions ) ;