ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

findmnt: simplify cache_set_targets() 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-07-01 10:36:40 +02:00
parent 8642cd7b0f
commit 23deb5aca0
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
misc-utils/findmnt.c
View File

@ -839,27 +839,20 @@ static struct libmnt_table *parse_tabfiles(char **files,
*/
static void cache_set_targets(struct libmnt_cache *cache)
{
struct libmnt_table *tb = NULL;
char *path = NULL;
int rc = 0;
struct libmnt_table *tb;
const char *path;
tb = mnt_new_table();
if (!tb)
goto done;
return;
path = access(_PATH_PROC_MOUNTINFO, R_OK) == 0 ?
_PATH_PROC_MOUNTINFO :
_PATH_PROC_MOUNTS;
rc = mnt_table_parse_file(tb, path);
if (rc)
goto done;
if (mnt_table_parse_file(tb, path) == 0)
mnt_cache_set_targets(cache, tb);
rc = mnt_cache_set_targets(cache, tb);
if (rc)
goto done;
done:
mnt_unref_table(tb);
}