[gparted/refactor: 2/3] Cleanup duplicate fs code
- From: Phillip Susi <psusi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted/refactor: 2/3] Cleanup duplicate fs code
- Date: Thu, 31 Jan 2013 22:14:39 +0000 (UTC)
commit 26c806ad7982ecb7b7c91f8e654d5825865f962d
Author: Phillip Susi <psusi ubuntu com>
Date: Wed Jan 30 20:07:44 2013 -0500
Cleanup duplicate fs code
Many filesystems do not implement some of their methods, but had to provide
dummy implementations. Remove all of the dummy implementations and instead
just provide one in the base FileSystem class.
include/FileSystem.h | 22 +++++++++---------
include/btrfs.h | 9 -------
include/exfat.h | 20 ----------------
include/ext2.h | 8 ------
include/fat16.h | 9 -------
include/fat32.h | 9 -------
include/hfs.h | 13 ----------
include/hfsplus.h | 13 ----------
include/jfs.h | 8 ------
include/linux_swap.h | 3 --
include/lvm2_pv.h | 11 ---------
include/nilfs2.h | 10 --------
include/ntfs.h | 5 ----
include/reiser4.h | 11 ---------
include/reiserfs.h | 8 ------
include/ufs.h | 16 -------------
include/xfs.h | 5 ----
src/btrfs.cc | 26 ---------------------
src/exfat.cc | 60 --------------------------------------------------
src/ext2.cc | 20 ----------------
src/fat16.cc | 25 --------------------
src/fat32.cc | 25 --------------------
src/hfs.cc | 43 -----------------------------------
src/hfsplus.cc | 43 -----------------------------------
src/jfs.cc | 20 ----------------
src/linux_swap.cc | 14 -----------
src/lvm2_pv.cc | 47 ---------------------------------------
src/nilfs2.cc | 26 ---------------------
src/ntfs.cc | 13 ----------
src/reiser4.cc | 35 -----------------------------
src/reiserfs.cc | 20 ----------------
src/ufs.cc | 57 -----------------------------------------------
src/xfs.cc | 13 ----------
33 files changed, 11 insertions(+), 656 deletions(-)
---
diff --git a/include/FileSystem.h b/include/FileSystem.h
index 2553e03..239e6c0 100644
--- a/include/FileSystem.h
+++ b/include/FileSystem.h
@@ -38,24 +38,24 @@ public:
static const Glib::ustring get_generic_text( CUSTOM_TEXT ttype, int index = 0 ) ;
virtual FS get_filesystem_support() = 0 ;
- virtual void set_used_sectors( Partition & partition ) = 0 ;
- virtual void read_label( Partition & partition ) = 0 ;
- virtual bool write_label( const Partition & partition, OperationDetail & operationdetail ) = 0 ;
- virtual void read_uuid( Partition & partition ) = 0 ;
- virtual bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) = 0 ;
- virtual bool create( const Partition & new_partition, OperationDetail & operationdetail ) = 0 ;
+ virtual void set_used_sectors( Partition & partition ) {};
+ virtual void read_label( Partition & partition ) {};
+ virtual bool write_label( const Partition & partition, OperationDetail & operationdetail ) { return false; };
+ virtual void read_uuid( Partition & partition ) {};
+ virtual bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) { return false; };
+ virtual bool create( const Partition & new_partition, OperationDetail & operationdetail ) { return false; };
virtual bool resize( const Partition & partition_new,
OperationDetail & operationdetail,
- bool fill_partition = false ) = 0 ;
+ bool fill_partition = false ) { return false; };
virtual bool move( const Partition & partition_new
, const Partition & partition_old
, OperationDetail & operationdetail
- ) = 0 ;
+ ) { return false; };
virtual bool copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) = 0 ;
- virtual bool check_repair( const Partition & partition, OperationDetail & operationdetail ) = 0 ;
- virtual bool remove( const Partition & partition, OperationDetail & operationdetail ) = 0 ;
+ OperationDetail & operationdetail ) { return false; };
+ virtual bool check_repair( const Partition & partition, OperationDetail & operationdetail ) { return false; };
+ virtual bool remove( const Partition & partition, OperationDetail & operationdetail ) { return true; };
bool success;
protected:
int execute_command( const Glib::ustring & command, OperationDetail & operationdetail,
diff --git a/include/btrfs.h b/include/btrfs.h
index 7402fe1..9cc59b3 100644
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -32,18 +32,9 @@ public:
void read_label( Partition & partition ) ;
bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
private:
static Byte_Value btrfs_size_to_num( Glib::ustring str, Byte_Value ptn_bytes, bool scale_up ) ;
diff --git a/include/exfat.h b/include/exfat.h
index e21562f..1d37409 100644
--- a/include/exfat.h
+++ b/include/exfat.h
@@ -28,26 +28,6 @@ class exfat : public FileSystem
{
public:
FS get_filesystem_support() ;
- void set_used_sectors( Partition & partition ) ;
- void read_label( Partition & partition ) ;
- bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
- void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
- bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new
- , OperationDetail & operationdetail
- , bool fill_partition = false
- ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path
- , const Glib::ustring & dest_part_path
- , OperationDetail & operationdetail
- ) ;
- bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/ext2.h b/include/ext2.h
index 8d4f9dc..5e4b53b 100644
--- a/include/ext2.h
+++ b/include/ext2.h
@@ -38,15 +38,7 @@ public:
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/fat16.h b/include/fat16.h
index f21348a..bfc4be4 100644
--- a/include/fat16.h
+++ b/include/fat16.h
@@ -36,16 +36,7 @@ public:
void read_uuid( Partition & partition ) ;
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
static const Glib::ustring Change_UUID_Warning [] ;
};
diff --git a/include/fat32.h b/include/fat32.h
index 51cd24f..514f7ae 100644
--- a/include/fat32.h
+++ b/include/fat32.h
@@ -36,16 +36,7 @@ public:
void read_uuid( Partition & partition ) ;
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
const static Glib::ustring ( & Change_UUID_Warning ) [] ;
};
diff --git a/include/hfs.h b/include/hfs.h
index 529f6ba..97895d7 100644
--- a/include/hfs.h
+++ b/include/hfs.h
@@ -29,22 +29,9 @@ class hfs : public FileSystem
{
public:
FS get_filesystem_support() ;
- void set_used_sectors( Partition & partition ) ;
void read_label( Partition & partition ) ;
- bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
- void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/hfsplus.h b/include/hfsplus.h
index 0f131e8..7d205cf 100644
--- a/include/hfsplus.h
+++ b/include/hfsplus.h
@@ -29,22 +29,9 @@ class hfsplus : public FileSystem
{
public:
FS get_filesystem_support() ;
- void set_used_sectors( Partition & partition ) ;
void read_label( Partition & partition ) ;
- bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
- void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/jfs.h b/include/jfs.h
index 5120657..ca86f41 100644
--- a/include/jfs.h
+++ b/include/jfs.h
@@ -36,15 +36,7 @@ public:
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/linux_swap.h b/include/linux_swap.h
index d62547a..0420f27 100644
--- a/include/linux_swap.h
+++ b/include/linux_swap.h
@@ -31,7 +31,6 @@ public:
virtual const Glib::ustring get_custom_text( CUSTOM_TEXT ttype, int index = 0 ) ;
FS get_filesystem_support() ;
- void set_used_sectors( Partition & partition ) ;
void read_label( Partition & partition ) ;
bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
void read_uuid( Partition & partition ) ;
@@ -45,8 +44,6 @@ public:
bool copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path,
OperationDetail & operationdetail ) ;
- bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/lvm2_pv.h b/include/lvm2_pv.h
index 50a6031..3dbc7de 100644
--- a/include/lvm2_pv.h
+++ b/include/lvm2_pv.h
@@ -30,19 +30,8 @@ public:
const Glib::ustring get_custom_text( CUSTOM_TEXT ttype, int index = 0 ) ;
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void read_label( Partition & partition ) ;
- bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
- void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path
- , const Glib::ustring & dest_part_path
- , OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
diff --git a/include/nilfs2.h b/include/nilfs2.h
index 55ee9e0..bffce4b 100644
--- a/include/nilfs2.h
+++ b/include/nilfs2.h
@@ -35,16 +35,6 @@ public:
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path
- , const Glib::ustring & dest_part_path
- , OperationDetail & operationdetail
- ) ;
- bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/ntfs.h b/include/ntfs.h
index b8a0a3f..c34c24f 100644
--- a/include/ntfs.h
+++ b/include/ntfs.h
@@ -37,15 +37,10 @@ public:
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
bool copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path,
OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
static const Glib::ustring Change_UUID_Warning [] ;
};
diff --git a/include/reiser4.h b/include/reiser4.h
index 3e8b8c3..befebf5 100644
--- a/include/reiser4.h
+++ b/include/reiser4.h
@@ -31,20 +31,9 @@ public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
void read_label( Partition & partition ) ;
- bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/reiserfs.h b/include/reiserfs.h
index 7f91106..f2a395f 100644
--- a/include/reiserfs.h
+++ b/include/reiserfs.h
@@ -36,15 +36,7 @@ public:
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/ufs.h b/include/ufs.h
index 20626f9..74ccfa7 100644
--- a/include/ufs.h
+++ b/include/ufs.h
@@ -29,22 +29,6 @@ class ufs : public FileSystem
{
public:
FS get_filesystem_support() ;
- void set_used_sectors( Partition & partition ) ;
- void read_label( Partition & partition ) ;
- bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
- void read_uuid( Partition & partition ) ;
- bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
- bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
- bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
- bool copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail ) ;
- bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/include/xfs.h b/include/xfs.h
index 6b73ca5..4b9d51e 100644
--- a/include/xfs.h
+++ b/include/xfs.h
@@ -36,15 +36,10 @@ public:
bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
- bool move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- ) ;
bool copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path,
OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
- bool remove( const Partition & partition, OperationDetail & operationdetail ) ;
};
} //GParted
diff --git a/src/btrfs.cc b/src/btrfs.cc
index e3d11ce..c7cf842 100644
--- a/src/btrfs.cc
+++ b/src/btrfs.cc
@@ -166,27 +166,6 @@ bool btrfs::write_label( const Partition & partition, OperationDetail & operatio
return ! execute_command( "btrfs filesystem label " + partition .get_path() + " \"" + partition .get_label() + "\"", operationdetail ) ;
}
-bool btrfs::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool btrfs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool btrfs::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
-// TODO
- return true ;
-}
-
bool btrfs::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
{
bool success = true ;
@@ -313,11 +292,6 @@ void btrfs::read_uuid( Partition & partition )
}
}
-bool btrfs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
//Private methods
//Return the value of a btrfs tool formatted size, including reversing
diff --git a/src/exfat.cc b/src/exfat.cc
index 17ce5c2..bfd34c4 100644
--- a/src/exfat.cc
+++ b/src/exfat.cc
@@ -34,65 +34,5 @@ FS exfat::get_filesystem_support()
return fs ;
}
-void exfat::set_used_sectors( Partition & partition )
-{
-}
-
-void exfat::read_label( Partition & partition )
-{
-}
-
-bool exfat::write_label( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-void exfat::read_uuid( Partition & partition )
-{
-}
-
-bool exfat::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool exfat::create( const Partition & new_partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool exfat::resize( const Partition & partition_new
- , OperationDetail & operationdetail
- , bool fill_partition )
-{
- return true ;
-}
-
-bool exfat::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool exfat::copy( const Glib::ustring & src_part_path
- , const Glib::ustring & dest_part_path
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool exfat::check_repair( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool exfat::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/ext2.cc b/src/ext2.cc
index 1462162..f4628de 100644
--- a/src/ext2.cc
+++ b/src/ext2.cc
@@ -186,21 +186,6 @@ bool ext2::resize( const Partition & partition_new, OperationDetail & operationd
return ! execute_command( str_temp, operationdetail ) ;
}
-bool ext2::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool ext2::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool ext2::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
exit_status = execute_command( "e2fsck -f -y -v " + partition.get_path(), operationdetail,
@@ -211,11 +196,6 @@ bool ext2::check_repair( const Partition & partition, OperationDetail & operatio
return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ;
}
-bool ext2::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/fat16.cc b/src/fat16.cc
index 7be59b6..60b690b 100644
--- a/src/fat16.cc
+++ b/src/fat16.cc
@@ -234,26 +234,6 @@ bool fat16::create( const Partition & new_partition, OperationDetail & operation
true );
}
-bool fat16::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
-{
- return true ;
-}
-
-bool fat16::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool fat16::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool fat16::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
exit_status = execute_command( "dosfsck -a -w -v " + partition .get_path(), operationdetail,
@@ -262,11 +242,6 @@ bool fat16::check_repair( const Partition & partition, OperationDetail & operati
return ( exit_status == 0 || exit_status == 1 || exit_status == 256 ) ;
}
-bool fat16::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/fat32.cc b/src/fat32.cc
index 6ed6033..b654319 100644
--- a/src/fat32.cc
+++ b/src/fat32.cc
@@ -222,26 +222,6 @@ bool fat32::create( const Partition & new_partition, OperationDetail & operation
false, true );
}
-bool fat32::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
-{
- return true ;
-}
-
-bool fat32::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool fat32::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool fat32::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
exit_status = execute_command( "dosfsck -a -w -v " + partition.get_path(), operationdetail,
@@ -250,9 +230,4 @@ bool fat32::check_repair( const Partition & partition, OperationDetail & operati
return ( exit_status == 0 || exit_status == 1 || exit_status == 256 ) ;
}
-bool fat32::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/hfs.cc b/src/hfs.cc
index c30e13c..760cb1d 100644
--- a/src/hfs.cc
+++ b/src/hfs.cc
@@ -51,10 +51,6 @@ FS hfs::get_filesystem_support()
return fs ;
}
-void hfs::set_used_sectors( Partition & partition )
-{
-}
-
void hfs::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
@@ -76,20 +72,6 @@ void hfs::read_label( Partition & partition )
}
}
-bool hfs::write_label( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-void hfs::read_uuid( Partition & partition )
-{
-}
-
-bool hfs::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool hfs::create( const Partition & new_partition, OperationDetail & operationdetail )
{
Glib::ustring cmd = "";
@@ -100,35 +82,10 @@ bool hfs::create( const Partition & new_partition, OperationDetail & operationde
return ! execute_command( cmd , operationdetail ) ;
}
-bool hfs::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
-{
- return true ;
-}
-
-bool hfs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool hfs::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool hfs::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
//FIXME: find out what the returnvalue is in case of modified.. also check what the -a flag does.. (there is no manpage)
return ! execute_command( "hfsck -v " + partition .get_path(), operationdetail ) ;
}
-bool hfs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/hfsplus.cc b/src/hfsplus.cc
index f662315..b257afa 100644
--- a/src/hfsplus.cc
+++ b/src/hfsplus.cc
@@ -49,10 +49,6 @@ FS hfsplus::get_filesystem_support()
return fs ;
}
-void hfsplus::set_used_sectors( Partition & partition )
-{
-}
-
void hfsplus::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
@@ -74,20 +70,6 @@ void hfsplus::read_label( Partition & partition )
}
}
-bool hfsplus::write_label( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-void hfsplus::read_uuid( Partition & partition )
-{
-}
-
-bool hfsplus::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool hfsplus::create( const Partition & new_partition, OperationDetail & operationdetail )
{
Glib::ustring cmd = "";
@@ -98,34 +80,9 @@ bool hfsplus::create( const Partition & new_partition, OperationDetail & operati
return ! execute_command( cmd , operationdetail ) ;
}
-bool hfsplus::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
-{
- return true ;
-}
-
-bool hfsplus::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool hfsplus::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool hfsplus::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "fsck.hfsplus -f -y " + partition .get_path(), operationdetail ) ;
}
-bool hfsplus::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/jfs.cc b/src/jfs.cc
index ff0d001..3d923a3 100644
--- a/src/jfs.cc
+++ b/src/jfs.cc
@@ -178,21 +178,6 @@ bool jfs::resize( const Partition & partition_new, OperationDetail & operationde
return success ;
}
-bool jfs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool jfs::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool jfs::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
exit_status = execute_command( "jfs_fsck -f " + partition.get_path(), operationdetail,
@@ -201,11 +186,6 @@ bool jfs::check_repair( const Partition & partition, OperationDetail & operation
return ( exit_status == 0 || exit_status == 1 ) ;
}
-bool jfs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/linux_swap.cc b/src/linux_swap.cc
index 29a43cd..8374f01 100644
--- a/src/linux_swap.cc
+++ b/src/linux_swap.cc
@@ -64,10 +64,6 @@ FS linux_swap::get_filesystem_support()
return fs ;
}
-void linux_swap::set_used_sectors( Partition & partition )
-{
-}
-
void linux_swap::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "swaplabel " + partition .get_path(), output, error, true ) )
@@ -172,14 +168,4 @@ bool linux_swap::copy( const Glib::ustring & src_part_path,
return true ;
}
-bool linux_swap::check_repair( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool linux_swap::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/lvm2_pv.cc b/src/lvm2_pv.cc
index 62f4670..91a1090 100644
--- a/src/lvm2_pv.cc
+++ b/src/lvm2_pv.cc
@@ -86,25 +86,6 @@ void lvm2_pv::set_used_sectors( Partition & partition )
}
}
-void lvm2_pv::read_label( Partition & partition )
-{
- return ;
-}
-
-bool lvm2_pv::write_label( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-void lvm2_pv::read_uuid( Partition & partition )
-{
-}
-
-bool lvm2_pv::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool lvm2_pv::create( const Partition & new_partition, OperationDetail & operationdetail )
{
return ! execute_command( "lvm pvcreate -M 2 " + new_partition .get_path(), operationdetail ) ;
@@ -120,34 +101,6 @@ bool lvm2_pv::resize( const Partition & partition_new, OperationDetail & operati
return ! execute_command( "lvm pvresize -v " + size + partition_new .get_path(), operationdetail ) ;
}
-bool lvm2_pv::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool lvm2_pv::copy( const Glib::ustring & src_part_path
- , const Glib::ustring & dest_part_path
- , OperationDetail & operationdetail )
-{
- //Copy not implemented.
- // Metadata fully describing a Volume Group is stored at the start of
- // each Physical Volume member. Internally LVM2 primarily uses UUIDs
- // to uniquely identify all objects (PVs, VG and LVs) but the interface
- // uses device names and VG and LV names. The general case of copying
- // a PV could confuse LVM2 because it will result in duplicate objects,
- // or even duplicate partial VGs and LVs if they span multiple PVs, so
- // it is not safe and should be achieved using other LVM2 commands. A
- // specific case of copying a PV is the right action when it is as part
- // of the transfer of an exported VG to a remote machine via storage
- // which will be detached from the local machine and attached to the
- // remote machine, but would probably fit better at a VG manipulation
- // layer. Thus copying of PVs is not implemented.
- return true ;
-}
-
bool lvm2_pv::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "lvm pvck -v " + partition .get_path(), operationdetail ) ;
diff --git a/src/nilfs2.cc b/src/nilfs2.cc
index 1256cd2..d0b84de 100644
--- a/src/nilfs2.cc
+++ b/src/nilfs2.cc
@@ -185,30 +185,4 @@ bool nilfs2::resize( const Partition & partition_new, OperationDetail & operatio
return success ;
}
-bool nilfs2::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool nilfs2::copy( const Glib::ustring & src_part_path
- , const Glib::ustring & dest_part_path
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool nilfs2::check_repair( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool nilfs2::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/ntfs.cc b/src/ntfs.cc
index c81d471..b46d343 100644
--- a/src/ntfs.cc
+++ b/src/ntfs.cc
@@ -224,14 +224,6 @@ bool ntfs::resize( const Partition & partition_new, OperationDetail & operationd
return return_value ;
}
-bool ntfs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
bool ntfs::copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path,
OperationDetail & operationdetail )
@@ -247,11 +239,6 @@ bool ntfs::check_repair( const Partition & partition, OperationDetail & operatio
return ! execute_command( "ntfsresize -P -i -f -v " + partition .get_path(), operationdetail ) ;
}
-bool ntfs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/reiser4.cc b/src/reiser4.cc
index 4099b59..de9601d 100644
--- a/src/reiser4.cc
+++ b/src/reiser4.cc
@@ -115,11 +115,6 @@ void reiser4::read_label( Partition & partition )
}
}
-bool reiser4::write_label( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
void reiser4::read_uuid( Partition & partition )
{
if ( ! Utils::execute_command( "debugfs.reiser4 " + partition .get_path(), output, error, true ) )
@@ -136,11 +131,6 @@ void reiser4::read_uuid( Partition & partition )
}
}
-bool reiser4::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool reiser4::create( const Partition & new_partition, OperationDetail & operationdetail )
{
return ! execute_command( "mkfs.reiser4 --yes --label \"" + new_partition.get_label() +
@@ -148,37 +138,12 @@ bool reiser4::create( const Partition & new_partition, OperationDetail & operati
false, true );
}
-bool reiser4::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
-{
- return true ;
-}
-
-bool reiser4::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool reiser4::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool reiser4::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "fsck.reiser4 --yes --fix --quiet " + partition.get_path(),
operationdetail, false, true );
}
-bool reiser4::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/reiserfs.cc b/src/reiserfs.cc
index 99be6d7..c0fa165 100644
--- a/src/reiserfs.cc
+++ b/src/reiserfs.cc
@@ -170,21 +170,6 @@ bool reiserfs::resize( const Partition & partition_new, OperationDetail & operat
return ( exit_status == 0 || exit_status == 256 ) ;
}
-bool reiserfs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool reiserfs::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
bool reiserfs::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
exit_status = execute_command( "reiserfsck --yes --fix-fixable --quiet " + partition.get_path(),
@@ -193,9 +178,4 @@ bool reiserfs::check_repair( const Partition & partition, OperationDetail & oper
return ( exit_status == 0 || exit_status == 1 || exit_status == 256 ) ;
}
-bool reiserfs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/ufs.cc b/src/ufs.cc
index 84b2197..4c2f583 100644
--- a/src/ufs.cc
+++ b/src/ufs.cc
@@ -35,63 +35,6 @@ FS ufs::get_filesystem_support()
return fs ;
}
-void ufs::set_used_sectors( Partition & partition )
-{
-}
-
-void ufs::read_label( Partition & partition )
-{
-}
-
-bool ufs::write_label( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-void ufs::read_uuid( Partition & partition )
-{
-}
-
-bool ufs::write_uuid( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool ufs::create( const Partition & new_partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool ufs::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
-{
- return true ;
-}
-
-bool ufs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
-bool ufs::copy( const Glib::ustring & src_part_path,
- const Glib::ustring & dest_part_path,
- OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool ufs::check_repair( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
-bool ufs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
diff --git a/src/xfs.cc b/src/xfs.cc
index d62baf3..60d0273 100644
--- a/src/xfs.cc
+++ b/src/xfs.cc
@@ -194,14 +194,6 @@ bool xfs::resize( const Partition & partition_new, OperationDetail & operationde
return success ;
}
-bool xfs::move( const Partition & partition_new
- , const Partition & partition_old
- , OperationDetail & operationdetail
- )
-{
- return true ;
-}
-
bool xfs::copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path,
OperationDetail & operationdetail )
@@ -256,11 +248,6 @@ bool xfs::check_repair( const Partition & partition, OperationDetail & operation
false, true );
}
-bool xfs::remove( const Partition & partition, OperationDetail & operationdetail )
-{
- return true ;
-}
-
} //GParted
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
