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

some internal codechanges. Looks a bit cleaner now. 

* src/Device.cc (Read_Disk_Layout): some internal codechanges. Looks a bit cleaner now.
This commit is contained in:
Bart Hakvoort 2004-10-11 11:59:28 +00:00
parent 9c328738c9
commit 2858ad26de
2 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-10-11 Bart Hakvoort <gparted@users.sf.net>
* src/Device.cc (Read_Disk_Layout): some internal codechanges. Looks a bit cleaner now.
2004-10-11 Bart Hakvoort <gparted@users.sf.net> 2004-10-11 Bart Hakvoort <gparted@users.sf.net>
* include/Device.h, * include/Device.h,

112
src/Device.cc
View File

@ -143,67 +143,63 @@ void Device::Read_Disk_Layout( bool deep_scan )
{ {
partition_temp .Reset( ) ; partition_temp .Reset( ) ;
part_path = this ->path + num_to_str( c_partition ->num ) ; part_path = this ->path + num_to_str( c_partition ->num ) ;
switch ( c_partition ->type ) //PRIMARY or LOGICAL
{ if ( c_partition ->type == 0 || c_partition ->type == 1 )
//NORMAL (PRIMARY) {
case 0 : if ( c_partition ->fs_type ) if ( c_partition ->fs_type )
temp = c_partition ->fs_type ->name ; temp = c_partition ->fs_type ->name ;
else else
{temp = "unknown" ; this ->error = (Glib::ustring) _( "Unable to detect filesystem! Possible reasons are:" ) + "\n-" + (Glib::ustring) _( "The filesystem is damaged" ) + "\n-" + (Glib::ustring) _( "The filesystem is unknown to libparted" ) + "\n-" + (Glib::ustring) _( "There is no filesystem available (unformatted)" ) ; } {
temp = "unknown" ;
partition_temp.Set( part_path, c_partition ->num, GParted::PRIMARY, temp, c_partition ->geom .start, c_partition ->geom .end, false, ped_partition_is_busy( c_partition ) ); this ->error = _( "Unable to detect filesystem! Possible reasons are:" ) ;
this ->error += "\n-";
if ( deep_scan ) this ->error += _( "The filesystem is damaged" ) ;
partition_temp .Set_Used( Get_Used_Sectors( c_partition, part_path ) ) ; this ->error += "\n-" ;
this ->error += _( "The filesystem is unknown to libparted" ) ;
this ->error += "\n-";
this ->error += _( "There is no filesystem available (unformatted)" ) ;
partition_temp .flags = Get_Flags( c_partition ) ; }
partition_temp .error = this ->error ; partition_temp.Set( part_path,
device_partitions.push_back( partition_temp ); c_partition ->num,
c_partition ->type == 0 ? GParted::PRIMARY : GParted::LOGICAL ,
break; temp, c_partition ->geom .start,
//LOGICAL c_partition ->geom .end,
case 1: if ( c_partition ->fs_type ) c_partition ->type ,
temp = c_partition ->fs_type ->name ; ped_partition_is_busy( c_partition ) );
else
{temp = "unknown" ; this ->error = (Glib::ustring) _( "Unable to detect filesystem! Possible reasons are:" ) + "\n-" + (Glib::ustring) _( "The filesystem is damaged" ) + "\n-" + (Glib::ustring) _( "The filesystem is unknown to libparted" ) + "\n-" + (Glib::ustring) _( "There is no filesystem available (unformatted)" ) ; }
partition_temp.Set( part_path, c_partition ->num, GParted::LOGICAL, temp, c_partition ->geom .start, c_partition ->geom .end, true, ped_partition_is_busy( c_partition ) );
if ( deep_scan )
partition_temp .Set_Used( Get_Used_Sectors( c_partition, part_path ) ) ;
partition_temp .flags = Get_Flags( c_partition ) ;
partition_temp .error = this ->error ;
device_partitions.push_back( partition_temp );
break; if ( deep_scan )
//EXTENDED partition_temp .Set_Used( Get_Used_Sectors( c_partition, part_path ) ) ;
case 2: partition_temp.Set( part_path, c_partition ->num, GParted::EXTENDED, "extended", c_partition ->geom .start, c_partition ->geom .end, false, ped_partition_is_busy( c_partition ) );
partition_temp .flags = Get_Flags( c_partition ) ;
partition_temp .flags = Get_Flags( c_partition ) ; partition_temp .error = this ->error ;//most likely useless, but paranoia me leaves it here.. =)
partition_temp .error = this ->error ;
device_partitions.push_back( partition_temp );
break;
//FREESPACE OUTSIDE EXTENDED
case 4: if ( (c_partition ->geom .end - c_partition ->geom .start) > MEGABYTE )
{
partition_temp.Set_Unallocated( c_partition ->geom .start, c_partition ->geom .end, c_partition ->type == 4 ? false : true );
device_partitions.push_back( partition_temp );
}
break ;
//FREESPACE INSIDE EXTENDED
case 5: if ( (c_partition ->geom .end - c_partition ->geom .start) > MEGABYTE )
{
partition_temp.Set_Unallocated( c_partition ->geom .start, c_partition ->geom .end, true );
device_partitions.push_back( partition_temp );
}
break ;
//METADATA (do nothing)
default: break;
} }
//EXTENDED
else if ( c_partition ->type == 2 )
{
partition_temp.Set( part_path ,
c_partition ->num ,
GParted::EXTENDED ,
"extended" ,
c_partition ->geom .start ,
c_partition ->geom .end ,
false ,
ped_partition_is_busy( c_partition ) );
partition_temp .flags = Get_Flags( c_partition ) ;
}
//FREESPACE
else if ( (c_partition ->type == 4 || c_partition ->type == 5) && (c_partition ->geom .end - c_partition ->geom .start) > MEGABYTE )
{
partition_temp.Set_Unallocated( c_partition ->geom .start, c_partition ->geom .end, c_partition ->type == 4 ? false : true );
}
if ( partition_temp .sector_start != -1 ) //paranoia check for unallocted space < 1 MB..
device_partitions.push_back( partition_temp );
//reset stuff.. //reset stuff..
this ->error = error_message = "" ; this ->error = error_message = "" ;
@ -514,7 +510,7 @@ Sector Device::Get_Used_Sectors( PedPartition *c_partition, const Glib::ustring
PedFileSystem *fs = NULL; PedFileSystem *fs = NULL;
PedConstraint *constraint = NULL; PedConstraint *constraint = NULL;
//prevent messagebox from showing up, but stores the error in "error" //prevent messagebox from showing up (the error wil be stored in the infodialog)
if ( show_libparted_message ) if ( show_libparted_message )
{ {
show_libparted_message = false ; show_libparted_message = false ;