diff options
| author | Karel Zak | 2014-07-01 10:36:40 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-07-01 10:36:40 +0200 |
| commit | 23deb5aca0af0aa8c844ea2738fd65a7575c25d3 (patch) | |
| tree | 6c242ebef4226b3bad70c7e9e278b898936430ef /misc-utils/findmnt.c | |
| parent | libmount: always use mnt_resolve_target() in mnt_fs_match_target() (diff) | |
| download | kernel-qcow2-util-linux-23deb5aca0af0aa8c844ea2738fd65a7575c25d3.tar.gz kernel-qcow2-util-linux-23deb5aca0af0aa8c844ea2738fd65a7575c25d3.tar.xz kernel-qcow2-util-linux-23deb5aca0af0aa8c844ea2738fd65a7575c25d3.zip | |
findmnt: simplify cache_set_targets()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/findmnt.c')
| -rw-r--r-- | misc-utils/findmnt.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 0b3e380fb..847c349a2 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -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); } |