"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/PartitionLUKS.cc" between
gparted-1.0.0.tar.gz and gparted-1.1.0.tar.gz

About: GParted is a graphical partition editor for creating, reorganizing, and deleting disk partitions (using GNU libparted).

PartitionLUKS.cc  (gparted-1.0.0):PartitionLUKS.cc  (gparted-1.1.0)
skipping to change at line 52 skipping to change at line 52
// Created partition is as though the file system wasn't encrypted, but adds the LUKS // Created partition is as though the file system wasn't encrypted, but adds the LUKS
// overhead into the file system usage. // overhead into the file system usage.
Partition * PartitionLUKS::clone_as_plain() const Partition * PartitionLUKS::clone_as_plain() const
{ {
// Clone the partition. // Clone the partition.
// WARNING: // WARNING:
// Deliberate object slicing of *this from PartitionLUKS to Partition. // Deliberate object slicing of *this from PartitionLUKS to Partition.
Partition * plain_ptn = new Partition( *this ); Partition * plain_ptn = new Partition( *this );
// Copy over file system attributes. // Copy over file system attributes.
plain_ptn->filesystem = this->encrypted.filesystem; plain_ptn->fstype = this->encrypted.fstype;
plain_ptn->uuid = this->encrypted.uuid; plain_ptn->uuid = this->encrypted.uuid;
plain_ptn->busy = this->encrypted.busy; plain_ptn->busy = this->encrypted.busy;
plain_ptn->fs_block_size = this->encrypted.fs_block_size; plain_ptn->fs_block_size = this->encrypted.fs_block_size;
Sector fs_size = this->header_size + this->encrypted.sectors_used + this- >encrypted.sectors_unused; Sector fs_size = this->header_size + this->encrypted.sectors_used + this- >encrypted.sectors_unused;
plain_ptn->set_sector_usage( fs_size, this->encrypted.sectors_unused ); plain_ptn->set_sector_usage( fs_size, this->encrypted.sectors_unused );
plain_ptn->clear_mountpoints(); plain_ptn->clear_mountpoints();
plain_ptn->add_mountpoints( this->encrypted.get_mountpoints() ); plain_ptn->add_mountpoints( this->encrypted.get_mountpoints() );
if ( this->encrypted.filesystem_label_known() ) if ( this->encrypted.filesystem_label_known() )
plain_ptn->set_filesystem_label( this->encrypted.get_filesystem_l abel() ); plain_ptn->set_filesystem_label( this->encrypted.get_filesystem_l abel() );
plain_ptn->clear_messages(); plain_ptn->clear_messages();
skipping to change at line 250 skipping to change at line 250
Partition & PartitionLUKS::get_filesystem_partition() Partition & PartitionLUKS::get_filesystem_partition()
{ {
if ( busy ) if ( busy )
return encrypted; return encrypted;
return *this; return *this;
} }
const Glib::ustring PartitionLUKS::get_filesystem_string() const const Glib::ustring PartitionLUKS::get_filesystem_string() const
{ {
if ( busy ) if ( busy )
return Utils::get_filesystem_string( true, encrypted.filesystem ) ; return Utils::get_filesystem_string(true, encrypted.fstype);
return Utils::get_encrypted_string(); return Utils::get_encrypted_string();
} }
} //GParted } //GParted
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)