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

Prefix ext2 member variables with m_ and initialise all POD members 

To make it clear they are all member variables.  Add missing
m_fs_block_size POD (Plain Old Data) member to the constructor
initialisation list so that it's never uninitialised.  And stop
unnecessarily assigning constant false to m_force_auto_64bit in
get_filesystem_support() because it is already initialised to false by
the constructor.
This commit is contained in:
Mike Fleetwood 2024-08-04 13:44:44 +01:00
parent 63c6b33aee
commit 188ffcc06b
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/ext2.h
View File

@ -31,11 +31,9 @@ namespace GParted
class ext2 : public FileSystem class ext2 : public FileSystem
{ {
const enum FSType specific_type;
Glib::ustring mkfs_cmd;
public: public:
ext2( enum FSType type ) : specific_type( type ), force_auto_64bit( false ) {}; ext2(enum FSType fstype) : m_specific_fstype(fstype), m_fs_block_size(0LL), m_force_auto_64bit(false) {};
FS get_filesystem_support() ; FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ; void set_used_sectors( Partition & partition ) ;
void read_label( Partition & partition ) ; void read_label( Partition & partition ) ;
@ -58,10 +56,14 @@ private:
void check_repair_progress( OperationDetail *operationdetail ); void check_repair_progress( OperationDetail *operationdetail );
void copy_progress( OperationDetail *operationdetail ); void copy_progress( OperationDetail *operationdetail );
Byte_Value fs_block_size; // Holds file system block size for the copy_progress() callback const enum FSType m_specific_fstype;
bool force_auto_64bit; // Manually setting ext4 64bit feature on creation Glib::ustring m_mkfs_cmd;
Byte_Value m_fs_block_size; // Holds file system block size for the copy_progress() callback
bool m_force_auto_64bit; // Manually setting ext4 64bit feature on creation
}; };
} //GParted } //GParted
#endif /* GPARTED_EXT2_H */ #endif /* GPARTED_EXT2_H */

46
src/ext2.cc
View File

@ -31,22 +31,21 @@ namespace GParted
FS ext2::get_filesystem_support() FS ext2::get_filesystem_support()
{ {
FS fs( specific_type ); FS fs(m_specific_fstype);
fs .busy = FS::GPARTED ; fs .busy = FS::GPARTED ;
mkfs_cmd = "mkfs." + Utils::get_filesystem_string( specific_type ); m_mkfs_cmd = "mkfs." + Utils::get_filesystem_string(m_specific_fstype);
bool have_64bit_feature = false; bool have_64bit_feature = false;
if ( ! Glib::find_program_in_path( mkfs_cmd ).empty() ) if (! Glib::find_program_in_path(m_mkfs_cmd).empty())
{ {
fs .create = FS::EXTERNAL ; fs .create = FS::EXTERNAL ;
fs .create_with_label = FS::EXTERNAL ; fs .create_with_label = FS::EXTERNAL ;
// Determine mkfs.ext4 version specific capabilities. // Determine mkfs.ext4 version specific capabilities.
force_auto_64bit = false; if (m_specific_fstype == FS_EXT4)
if ( specific_type == FS_EXT4 )
{ {
Utils::execute_command( mkfs_cmd + " -V", output, error, true ); Utils::execute_command(m_mkfs_cmd + " -V", output, error, true);
int mke2fs_major_ver = 0; int mke2fs_major_ver = 0;
int mke2fs_minor_ver = 0; int mke2fs_minor_ver = 0;
int mke2fs_patch_ver = 0; int mke2fs_patch_ver = 0;
@ -72,8 +71,8 @@ FS ext2::get_filesystem_support()
// removed mke2fs.conf(5) auto_64-bit_support option to // removed mke2fs.conf(5) auto_64-bit_support option to
// avoid the issues with multiple boot loaders not working // avoid the issues with multiple boot loaders not working
// with 64bit ext4 file systems. // with 64bit ext4 file systems.
force_auto_64bit = (mke2fs_major_ver > 1) m_force_auto_64bit = (mke2fs_major_ver > 1)
|| (mke2fs_major_ver == 1 && mke2fs_minor_ver >= 42); || (mke2fs_major_ver == 1 && mke2fs_minor_ver >= 42);
} }
} }
} }
@ -128,7 +127,7 @@ FS ext2::get_filesystem_support()
} }
#ifdef ENABLE_ONLINE_RESIZE #ifdef ENABLE_ONLINE_RESIZE
if ( specific_type != FS_EXT2 && Utils::kernel_version_at_least( 3, 6, 0 ) ) if (m_specific_fstype != FS_EXT2 && Utils::kernel_version_at_least(3, 6, 0))
fs.online_grow = fs.grow; fs.online_grow = fs.grow;
#endif #endif
@ -140,9 +139,9 @@ FS ext2::get_filesystem_support()
// and Resize/Move dialogs should limit FS correctly without this. See bug // and Resize/Move dialogs should limit FS correctly without this. See bug
// #766910 comment #12 onwards for further discussion. // #766910 comment #12 onwards for further discussion.
// https://bugzilla.gnome.org/show_bug.cgi?id=766910#c12 // https://bugzilla.gnome.org/show_bug.cgi?id=766910#c12
if ( specific_type == FS_EXT2 || if (m_specific_fstype == FS_EXT2 ||
specific_type == FS_EXT3 || m_specific_fstype == FS_EXT3 ||
( specific_type == FS_EXT4 && ! have_64bit_feature ) ) (m_specific_fstype == FS_EXT4 && ! have_64bit_feature) )
fs_limits.max_size = Utils::floor_size( 16 * TEBIBYTE - 4 * KIBIBYTE, MEBIBYTE ); fs_limits.max_size = Utils::floor_size( 16 * TEBIBYTE - 4 * KIBIBYTE, MEBIBYTE );
return fs ; return fs ;
@ -281,7 +280,7 @@ bool ext2::write_uuid( const Partition & partition, OperationDetail & operationd
bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail ) bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail )
{ {
Glib::ustring features; Glib::ustring features;
if ( force_auto_64bit ) if (m_force_auto_64bit)
{ {
// (#766910) Manually implement mke2fs.conf(5) auto_64-bit_support option // (#766910) Manually implement mke2fs.conf(5) auto_64-bit_support option
// by setting or clearing the 64bit feature on the command line depending // by setting or clearing the 64bit feature on the command line depending
@ -291,11 +290,12 @@ bool ext2::create( const Partition & new_partition, OperationDetail & operationd
else else
features = " -O ^64bit"; features = " -O ^64bit";
} }
return ! execute_command( mkfs_cmd + " -F" + features + return ! execute_command(m_mkfs_cmd + " -F" + features +
" -L " + Glib::shell_quote( new_partition.get_filesystem_label() ) + " -L " + Glib::shell_quote(new_partition.get_filesystem_label()) +
" " + Glib::shell_quote( new_partition.get_path() ), " " + Glib::shell_quote(new_partition.get_path()),
operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDOUT, operationdetail,
static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::create_progress ) ) ); EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDOUT,
static_cast<StreamSlot>(sigc::mem_fun(*this, &ext2::create_progress)));
} }
@ -333,7 +333,7 @@ bool ext2::move( const Partition & partition_new,
else else
cmd = "e2image -ra -p -O " + offset + " " + Glib::shell_quote( partition_new.get_path() ); cmd = "e2image -ra -p -O " + offset + " " + Glib::shell_quote( partition_new.get_path() );
fs_block_size = partition_old.fs_block_size; m_fs_block_size = partition_old.fs_block_size;
return ! execute_command( cmd, operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR, return ! execute_command( cmd, operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR,
static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::copy_progress ) ) ); static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::copy_progress ) ) );
} }
@ -342,7 +342,7 @@ bool ext2::copy( const Partition & src_part,
Partition & dest_part, Partition & dest_part,
OperationDetail & operationdetail ) OperationDetail & operationdetail )
{ {
fs_block_size = src_part.fs_block_size; m_fs_block_size = src_part.fs_block_size;
return ! execute_command( "e2image -ra -p " + Glib::shell_quote( src_part.get_path() ) + return ! execute_command( "e2image -ra -p " + Glib::shell_quote( src_part.get_path() ) +
" " + Glib::shell_quote( dest_part.get_path() ), " " + Glib::shell_quote( dest_part.get_path() ),
operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR, operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR,
@ -430,9 +430,9 @@ void ext2::copy_progress( OperationDetail *operationdetail )
long long progress, target; long long progress, target;
if ( sscanf( line.c_str(), "Copying %lld / %lld blocks", &progress, &target ) == 2 ) if ( sscanf( line.c_str(), "Copying %lld / %lld blocks", &progress, &target ) == 2 )
{ {
operationdetail->run_progressbar( (double)(progress * fs_block_size), operationdetail->run_progressbar((double)(progress * m_fs_block_size),
(double)(target * fs_block_size), (double)(target * m_fs_block_size),
PROGRESSBAR_TEXT_COPY_BYTES ); PROGRESSBAR_TEXT_COPY_BYTES);
} }
// Or when finished, on any line of STDERR, looks like "Copied 258033 / 258033 blocks ..." // Or when finished, on any line of STDERR, looks like "Copied 258033 / 258033 blocks ..."
else if ( error.find( "\nCopied " ) != error.npos ) else if ( error.find( "\nCopied " ) != error.npos )