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

Stop using member variables T, N & S in xfs class (!119) 

Restructure the variable parsing code into "if leading text found then
scan the number" pattern.

Closes !119 -  Tidy-ups for file system interface classes
This commit is contained in:
Mike Fleetwood 2023-10-08 11:00:35 +01:00 committed by Curtis Gedak
parent 43a17ecd66
commit 9c6ea6457e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xfs.cc
View File

@ -105,27 +105,27 @@ void xfs::set_used_sectors( Partition & partition )
output, error, true ) )
{
//blocksize
if ( sscanf( output.c_str(), "blocksize = %lld", &S ) != 1 )
S = -1 ;
long long block_size = -1;
sscanf(output.c_str(), "blocksize = %lld", &block_size);
//filesystem blocks
long long data_blocks = -1;
Glib::ustring::size_type index = output.find( "\ndblocks" );
if ( index > output .length() ||
sscanf( output.substr( index ).c_str(), "\ndblocks = %lld", &T ) != 1 )
T = -1 ;
if (index < output.length())
sscanf(output.substr(index).c_str(), "\ndblocks = %lld", &data_blocks);
//free blocks
long long free_data_blocks = -1;
index = output .find( "\nfdblocks" ) ;
if ( index > output .length() ||
sscanf( output.substr( index ).c_str(), "\nfdblocks = %lld", &N ) != 1 )
N = -1 ;
if (index < output.length())
sscanf(output.substr(index).c_str(), "\nfdblocks = %lld", &free_data_blocks);
if ( T > -1 && N > -1 && S > -1 )
if (block_size > -1 && data_blocks > -1 && free_data_blocks > -1)
{
Sector fs_size = T * S / partition.sector_size;
Sector fs_free = N * S / partition.sector_size;
Sector fs_size = data_blocks * block_size / partition.sector_size;
Sector fs_free = free_data_blocks * block_size / partition.sector_size;
partition.set_sector_usage(fs_size, fs_free);
partition.fs_block_size = S;
partition.fs_block_size = block_size;
}
}