summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 17:04:24 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 17:04:54 -0500
commit4e920142cc0aa514ad99be6e1fab277775f926f0 (patch)
treed5742bd944800d6e8c49b6c76a355fc0f521c76f /src
parent9f5ecdb0b11557be41c065f460bb22ab52bb0034 (diff)
mount: use DEFINE_TRIVIAL_CLEANUP_FUNC
Diffstat (limited to 'src')
-rw-r--r--src/core/mount.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/core/mount.c b/src/core/mount.c
index 812d57dd06..a39076838b 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -45,6 +45,9 @@
#include "exit-status.h"
#include "def.h"
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_table*, mnt_free_table);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_iter*, mnt_free_iter);
+
static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
[MOUNT_DEAD] = UNIT_INACTIVE,
[MOUNT_MOUNTING] = UNIT_ACTIVATING,
@@ -1514,17 +1517,9 @@ fail:
return r;
}
-static inline void mnt_free_table_p(struct libmnt_table **tb) {
- mnt_free_table(*tb);
-}
-
-static inline void mnt_free_iter_p(struct libmnt_iter **itr) {
- mnt_free_iter(*itr);
-}
-
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
- _cleanup_(mnt_free_table_p) struct libmnt_table *tb = NULL;
- _cleanup_(mnt_free_iter_p) struct libmnt_iter *itr = NULL;
+ _cleanup_(mnt_free_tablep) struct libmnt_table *tb = NULL;
+ _cleanup_(mnt_free_iterp) struct libmnt_iter *itr = NULL;
struct libmnt_fs *fs;
int r = 0;