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

Remove now superfluous load_fs_info_cache() (#131) 

This method is now only called from one location in the code so put it's
two lines of code there.

Closes #131 - GParted hangs when non-named device is hung
This commit is contained in:
Mike Fleetwood 2021-01-31 12:54:49 +00:00 committed by Curtis Gedak
parent 52ed42de28
commit e9d4a21bfb
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/FS_Info.h
View File

@ -49,7 +49,6 @@ private:
static bool not_initialised_then_error(); static bool not_initialised_then_error();
static void set_commands_found(); static void set_commands_found();
static const FS_Entry & get_cache_entry_by_path( const Glib::ustring & path ); static const FS_Entry & get_cache_entry_by_path( const Glib::ustring & path );
static void load_fs_info_cache(const std::vector<Glib::ustring>& paths);
static bool run_blkid_load_cache(const std::vector<Glib::ustring>& paths); static bool run_blkid_load_cache(const std::vector<Glib::ustring>& paths);
static void update_fs_info_cache_all_labels(); static void update_fs_info_cache_all_labels();
static bool run_blkid_update_cache_one_label( FS_Entry & fs_entry ); static bool run_blkid_update_cache_one_label( FS_Entry & fs_entry );

10
src/FS_Info.cc
View File

@ -54,7 +54,8 @@ std::vector<FS_Entry> FS_Info::fs_info_cache;
void FS_Info::load_cache_for_paths(const std::vector<Glib::ustring>& paths) void FS_Info::load_cache_for_paths(const std::vector<Glib::ustring>& paths)
{ {
set_commands_found(); set_commands_found();
load_fs_info_cache(paths); fs_info_cache.clear();
run_blkid_load_cache(paths);
fs_info_cache_initialized = true; fs_info_cache_initialized = true;
} }
@ -206,13 +207,6 @@ const FS_Entry & FS_Info::get_cache_entry_by_path( const Glib::ustring & path )
} }
void FS_Info::load_fs_info_cache(const std::vector<Glib::ustring>& paths)
{
fs_info_cache.clear();
run_blkid_load_cache(paths);
}
bool FS_Info::run_blkid_load_cache(const std::vector<Glib::ustring>& paths) bool FS_Info::run_blkid_load_cache(const std::vector<Glib::ustring>& paths)
{ {
// Parse blkid output line by line extracting mandatory field: path and optional // Parse blkid output line by line extracting mandatory field: path and optional