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

Rename set_device_partitions() local variable of type FSType (!52) 

Closes !52 - Rename members and variables currently named 'filesystem'
This commit is contained in:
Mike Fleetwood 2019-06-13 10:45:30 +01:00
parent c85fc66dcf
commit 2cbb867508
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GParted_Core.cc
View File

@ -815,7 +815,7 @@ void GParted_Core::set_device_partitions( Device & device, PedDevice* lp_device,
libparted_messages .clear() ; libparted_messages .clear() ;
Partition * partition_temp = NULL; Partition * partition_temp = NULL;
bool partition_is_busy = false ; bool partition_is_busy = false ;
FSType filesystem; FSType fstype;
std::vector<Glib::ustring> detect_messages; std::vector<Glib::ustring> detect_messages;
Glib::ustring partition_path; Glib::ustring partition_path;
@ -837,7 +837,7 @@ void GParted_Core::set_device_partitions( Device & device, PedDevice* lp_device,
{ {
case PED_PARTITION_NORMAL: case PED_PARTITION_NORMAL:
case PED_PARTITION_LOGICAL: case PED_PARTITION_LOGICAL:
filesystem = detect_filesystem( lp_device, lp_partition, detect_messages ); fstype = detect_filesystem(lp_device, lp_partition, detect_messages);
partition_path = get_partition_path(lp_partition); partition_path = get_partition_path(lp_partition);
#ifndef USE_LIBPARTED_DMRAID #ifndef USE_LIBPARTED_DMRAID
@ -847,19 +847,19 @@ void GParted_Core::set_device_partitions( Device & device, PedDevice* lp_device,
{ {
//Try device_name + partition_number //Try device_name + partition_number
Glib::ustring dmraid_path = device .get_path() + Utils::num_to_str( lp_partition ->num ) ; Glib::ustring dmraid_path = device .get_path() + Utils::num_to_str( lp_partition ->num ) ;
partition_is_busy = is_busy( filesystem, dmraid_path ) ; partition_is_busy = is_busy(fstype, dmraid_path);
//Try device_name + p + partition_number //Try device_name + p + partition_number
dmraid_path = device .get_path() + "p" + Utils::num_to_str( lp_partition ->num ) ; dmraid_path = device .get_path() + "p" + Utils::num_to_str( lp_partition ->num ) ;
partition_is_busy |= is_busy( filesystem, dmraid_path ) ; partition_is_busy |= is_busy(fstype, dmraid_path);
} }
else else
#endif #endif
{ {
partition_is_busy = is_busy( filesystem, partition_path ) ; partition_is_busy = is_busy(fstype, partition_path);
} }
if ( filesystem == FS_LUKS ) if (fstype == FS_LUKS)
partition_temp = new PartitionLUKS(); partition_temp = new PartitionLUKS();
else else
partition_temp = new Partition(); partition_temp = new Partition();
@ -868,7 +868,7 @@ void GParted_Core::set_device_partitions( Device & device, PedDevice* lp_device,
lp_partition->num, lp_partition->num,
( lp_partition->type == PED_PARTITION_NORMAL ) ? TYPE_PRIMARY ( lp_partition->type == PED_PARTITION_NORMAL ) ? TYPE_PRIMARY
: TYPE_LOGICAL, : TYPE_LOGICAL,
filesystem, fstype,
lp_partition->geom.start, lp_partition->geom.start,
lp_partition->geom.end, lp_partition->geom.end,
device.sector_size, device.sector_size,
@ -878,7 +878,7 @@ void GParted_Core::set_device_partitions( Device & device, PedDevice* lp_device,
set_flags( *partition_temp, lp_partition ); set_flags( *partition_temp, lp_partition );
if ( filesystem == FS_LUKS ) if (fstype == FS_LUKS)
set_luks_partition( *dynamic_cast<PartitionLUKS *>( partition_temp ) ); set_luks_partition( *dynamic_cast<PartitionLUKS *>( partition_temp ) );
if ( partition_temp->busy && partition_temp->partition_number > device.highest_busy ) if ( partition_temp->busy && partition_temp->partition_number > device.highest_busy )