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

be a bit more verbose on errior in set_used_sectors() 

* src/ext2.cc
  src/ext3.cc
  src/fat16.cc
  src/fat32.cc
  src/jfs.cc
  src/ntfs.cc
  src/reiser4.cc
  src/reiserfs.cc
  src/xfs.cc: be a bit more verbose on errior in set_used_sectors()
This commit is contained in:
Bart Hakvoort 2006-09-08 20:51:31 +00:00
parent 59fe25882a
commit 4d895659d3
10 changed files with 76 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/ext2.cc
src/ext3.cc
src/fat16.cc
src/fat32.cc
src/jfs.cc
src/ntfs.cc
src/reiser4.cc
src/reiserfs.cc
src/xfs.cc: be a bit more verbose on errior in set_used_sectors()
2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/GParted_Core.h, * include/GParted_Core.h,

8
src/ext2.cc
View File

@ -69,7 +69,13 @@ void ext2::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail ) bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/ext3.cc
View File

@ -70,7 +70,13 @@ void ext3::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool ext3::create( const Partition & new_partition, OperationDetail & operationdetail ) bool ext3::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/fat16.cc
View File

@ -70,7 +70,13 @@ void fat16::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool fat16::create( const Partition & new_partition, OperationDetail & operationdetail ) bool fat16::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/fat32.cc
View File

@ -70,7 +70,13 @@ void fat32::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool fat32::create( const Partition & new_partition, OperationDetail & operationdetail ) bool fat32::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/jfs.cc
View File

@ -90,7 +90,13 @@ void jfs::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool jfs::create( const Partition & new_partition, OperationDetail & operationdetail ) bool jfs::create( const Partition & new_partition, OperationDetail & operationdetail )

10
src/ntfs.cc
View File

@ -67,8 +67,14 @@ void ntfs::set_used_sectors( Partition & partition )
if ( N > -1 ) if ( N > -1 )
partition .set_used( Utils::round( N / 512.0 ) ) ; partition .set_used( Utils::round( N / 512.0 ) ) ;
} }
else//FIXME: i think it's a good idea to push the output here as well else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool ntfs::create( const Partition & new_partition, OperationDetail & operationdetail ) bool ntfs::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/reiser4.cc
View File

@ -68,7 +68,13 @@ void reiser4::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool reiser4::create( const Partition & new_partition, OperationDetail & operationdetail ) bool reiser4::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/reiserfs.cc
View File

@ -73,7 +73,13 @@ void reiserfs::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool reiserfs::create( const Partition & new_partition, OperationDetail & operationdetail ) bool reiserfs::create( const Partition & new_partition, OperationDetail & operationdetail )

8
src/xfs.cc
View File

@ -92,7 +92,13 @@ void xfs::set_used_sectors( Partition & partition )
partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ; partition .Set_Unused( Utils::round( N * ( S / 512.0 ) ) ) ;
} }
else else
partition .messages .push_back( error ) ; {
if ( ! output .empty() )
partition .messages .push_back( output ) ;
if ( ! error .empty() )
partition .messages .push_back( error ) ;
}
} }
bool xfs::create( const Partition & new_partition, OperationDetail & operationdetail ) bool xfs::create( const Partition & new_partition, OperationDetail & operationdetail )