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

Reorder parameters to add_mountpoint_entry() 

To match the order of the members in struct MountEntry.
This commit is contained in:
Mike Fleetwood 2021-08-11 22:20:33 +01:00 committed by Curtis Gedak
parent f5e6239452
commit a7f9ec65cf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Mount_Info.h
View File

@ -59,8 +59,8 @@ private:
static void read_mountpoints_from_file( const Glib::ustring & filename, MountMapping & map );
static void add_mountpoint_entry( MountMapping & map,
Glib::ustring & node,
Glib::ustring & mountpoint,
bool readonly );
bool readonly,
Glib::ustring& mountpoint);
static bool parse_readonly_flag( const Glib::ustring & str );
static void read_mountpoints_from_file_swaps( const Glib::ustring & filename,
MountMapping & map );

8
src/Mount_Info.cc
View File

@ -148,7 +148,7 @@ void Mount_Info::read_mountpoints_from_file( const Glib::ustring & filename, Mou
Glib::ustring mountpoint = p->mnt_dir;
add_mountpoint_entry(map, node, mountpoint, parse_readonly_flag(p->mnt_opts));
add_mountpoint_entry(map, node, parse_readonly_flag(p->mnt_opts), mountpoint);
}
endmntent( fp );
@ -157,8 +157,8 @@ void Mount_Info::read_mountpoints_from_file( const Glib::ustring & filename, Mou
void Mount_Info::add_mountpoint_entry( MountMapping & map,
Glib::ustring & node,
Glib::ustring & mountpoint,
bool readonly )
bool readonly,
Glib::ustring& mountpoint)
{
// Only add node path if mount point exists
if ( file_test( mountpoint, Glib::FILE_TEST_EXISTS ) )
@ -236,7 +236,7 @@ void Mount_Info::read_mountpoints_from_mount_command( MountMapping & map )
Glib::ustring mountpoint = Utils::regexp_label( lines[ i ], "^[^[:blank:]]+ on ([^[:blank:]]+) " );
Glib::ustring mntopts = Utils::regexp_label( lines[i], " type [^[:blank:]]+ \\(([^\\)]*)\\)" );
if ( ! node.empty() )
add_mountpoint_entry( map, node, mountpoint, parse_readonly_flag( mntopts ) );
add_mountpoint_entry(map, node, parse_readonly_flag(mntopts), mountpoint);
}
}
}