X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.c;h=a39076838b205f80fc0b2110131bfa78566adcf9;hb=a2c0e528b8b5ba370527db279605e4e4135689c1;hp=fc160b6b1db510fa20dbba249933c596fe9bcf39;hpb=fddf1a3189aa6e2ea641e0a9f995344c14e8d1e0;p=elogind.git

diff --git a/src/core/mount.c b/src/core/mount.c
index fc160b6b1..a39076838 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,
@@ -74,13 +77,13 @@ static bool mount_needs_network(const char *options, const char *fstype) {
         return false;
 }
 
-static bool mount_is_network(MountParameters *p) {
+static bool mount_is_network(const MountParameters *p) {
         assert(p);
 
         return mount_needs_network(p->options, p->fstype);
 }
 
-static bool mount_is_bind(MountParameters *p) {
+static bool mount_is_bind(const MountParameters *p) {
         assert(p);
 
         if (mount_test_option(p->options, "bind"))
@@ -98,13 +101,13 @@ static bool mount_is_bind(MountParameters *p) {
         return false;
 }
 
-static bool mount_is_auto(MountParameters *p) {
+static bool mount_is_auto(const MountParameters *p) {
         assert(p);
 
         return !mount_test_option(p->options, "noauto");
 }
 
-static bool needs_quota(MountParameters *p) {
+static bool needs_quota(const MountParameters *p) {
         assert(p);
 
         if (mount_is_network(p))
@@ -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;