tree-wide: use mfree more

diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index d2ec516d297ccaca972cb8d9d85bb36e600c8716..4570b8e4baab44afa49ef667257833be54568fde 100644 (file)
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -62,9 +62,7 @@ Prioq* prioq_free(Prioq *q) {
                 return NULL;
 
         free(q->items);
                 return NULL;
 
         free(q->items);

-        free(q);
-
-        return NULL;
+        return mfree(q);

 }
 
 int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) {
 }
 
 int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) {

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index dc7de5dab82538e4cfd969956d3eecb926845bb7..6b06e643c99398f6226d788589eeb04c70854abd 100644 (file)
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -610,8 +610,7 @@ char *strreplace(const char *text, const char *old_string, const char *new_strin
         return r;
 
 oom:
         return r;
 
 oom:

-        free(r);
-        return NULL;
+        return mfree(r);

 }
 
 char *strip_tab_ansi(char **ibuf, size_t *_isz) {
 }
 
 char *strip_tab_ansi(char **ibuf, size_t *_isz) {


@@ -682,8 +681,7 @@ char *strip_tab_ansi(char **ibuf, size_t *_isz) {
 
         if (ferror(f)) {
                 fclose(f);
 
         if (ferror(f)) {
                 fclose(f);

-                free(obuf);
-                return NULL;
+                return mfree(obuf);

         }
 
         fclose(f);
         }
 
         fclose(f);

diff --git a/src/basic/strv.c b/src/basic/strv.c
index baaa72e674dc98b3ca3126efc1e385019ef361d0..c98e956fd92ce7be1cfa5a8e55e0276f77f59163 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -87,8 +87,7 @@ void strv_clear(char **l) {
 
 char **strv_free(char **l) {
         strv_clear(l);
 
 char **strv_free(char **l) {
         strv_clear(l);

-        free(l);
-        return NULL;
+        return mfree(l);

 }
 
 char **strv_free_erase(char **l) {
 }
 
 char **strv_free_erase(char **l) {


@@ -431,8 +430,7 @@ char *strv_join_quoted(char **l) {
         return buf;
 
  oom:
         return buf;
 
  oom:

-        free(buf);
-        return NULL;
+        return mfree(buf);

 }
 #endif // 0
 
 }
 #endif // 0
 


@@ -882,8 +880,7 @@ char ***strv_free_free(char ***l) {
         for (i = l; *i; i++)
                 strv_free(*i);
 
         for (i = l; *i; i++)
                 strv_free(*i);
 

-        free(l);
-        return NULL;
+        return mfree(l);

 }
 
 char **strv_skip(char **l, size_t n) {
 }
 
 char **strv_skip(char **l, size_t n) {

diff --git a/src/libelogind/sd-bus/bus-slot.c b/src/libelogind/sd-bus/bus-slot.c
index 364360ccaea16ebced20c2b87156899353f34d5d..cd5e9767470906d25ee7f37e93f344e508616f53 100644 (file)
--- a/src/libelogind/sd-bus/bus-slot.c
+++ b/src/libelogind/sd-bus/bus-slot.c
@@ -212,9 +212,7 @@ _public_ sd_bus_slot* sd_bus_slot_unref(sd_bus_slot *slot) {
 
         bus_slot_disconnect(slot);
         free(slot->description);
 
         bus_slot_disconnect(slot);
         free(slot->description);

-        free(slot);
-
-        return NULL;
+        return mfree(slot);

 }
 
 #if 0 /// UNNEEDED by elogind
 }
 
 #if 0 /// UNNEEDED by elogind

diff --git a/src/libelogind/sd-bus/bus-track.c b/src/libelogind/sd-bus/bus-track.c
index 77a63a978c7e09d8b26cdf8a9bf49fd7664aafc1..35dd563b166015871a5f8c976147b1d3ae2c6cad 100644 (file)
--- a/src/libelogind/sd-bus/bus-track.c
+++ b/src/libelogind/sd-bus/bus-track.c
@@ -74,9 +74,7 @@ static struct track_item* track_item_free(struct track_item *i) {
 
         sd_bus_slot_unref(i->slot);
         free(i->name);
 
         sd_bus_slot_unref(i->slot);
         free(i->name);

-        free(i);
-
-        return NULL;
+        return mfree(i);

 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct track_item*, track_item_free);
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct track_item*, track_item_free);


@@ -206,9 +204,7 @@ _public_ sd_bus_track* sd_bus_track_unref(sd_bus_track *track) {
         bus_track_remove_from_queue(track);
         hashmap_free(track->names);
         sd_bus_unref(track->bus);
         bus_track_remove_from_queue(track);
         hashmap_free(track->names);
         sd_bus_unref(track->bus);

-        free(track);
-
-        return NULL;
+        return mfree(track);

 }
 
 static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) {
 }
 
 static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) {

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index baa6b7113c1038ff4f706589273ad3d421f29d10..90fb93bbaf85ecc6b80bd3383cfcc6381eb59dd7 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -43,15 +43,12 @@ Button* button_new(Manager *m, const char *name) {
                 return NULL;
 
         b->name = strdup(name);
                 return NULL;
 
         b->name = strdup(name);

-        if (!b->name) {
-                free(b);
-                return NULL;
-        }
+        if (!b->name)
+                return mfree(b);

 
         if (hashmap_put(m->buttons, b->name, b) < 0) {
                 free(b->name);
 
         if (hashmap_put(m->buttons, b->name, b) < 0) {
                 free(b->name);

-                free(b);
-                return NULL;
+                return mfree(b);

         }
 
         b->manager = m;
         }
 
         b->manager = m;

diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index eb5edd1cd5e11d2ce8ef2731668a1e65701497ad..6537fa04bfcbd6685fa5132d28ca508aea81b591 100644 (file)
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -34,15 +34,12 @@ Device* device_new(Manager *m, const char *sysfs, bool master) {
                 return NULL;
 
         d->sysfs = strdup(sysfs);
                 return NULL;
 
         d->sysfs = strdup(sysfs);

-        if (!d->sysfs) {
-                free(d);
-                return NULL;
-        }
+        if (!d->sysfs)
+                return mfree(d);

 
         if (hashmap_put(m->devices, d->sysfs, d) < 0) {
                 free(d->sysfs);
 
         if (hashmap_put(m->devices, d->sysfs, d) < 0) {
                 free(d->sysfs);

-                free(d);
-                return NULL;
+                return mfree(d);

         }
 
         d->manager = m;
         }
 
         d->manager = m;

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 6c78e0dddc9f0d8e255a2e2b2d0614001750084a..c93b24009bbc451ebca77c987c6f3606be18cd2f 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -45,17 +45,14 @@ Inhibitor* inhibitor_new(Manager *m, const char* id) {
                 return NULL;
 
         i->state_file = strappend("/run/systemd/inhibit/", id);
                 return NULL;
 
         i->state_file = strappend("/run/systemd/inhibit/", id);

-        if (!i->state_file) {
-                free(i);
-                return NULL;
-        }
+        if (!i->state_file)
+                return mfree(i);

 
         i->id = basename(i->state_file);
 
         if (hashmap_put(m->inhibitors, i->id, i) < 0) {
                 free(i->state_file);
 
         i->id = basename(i->state_file);
 
         if (hashmap_put(m->inhibitors, i->id, i) < 0) {
                 free(i->state_file);

-                free(i);
-                return NULL;
+                return mfree(i);

         }
 
         i->manager = m;
         }
 
         i->manager = m;

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index ae42811dea4d12dcc3242fb5361cab4e09525424..194ebc1b794de88c7986d96c0ab7c992b7f6f0d5 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -48,18 +48,15 @@ Seat *seat_new(Manager *m, const char *id) {
                 return NULL;
 
         s->state_file = strappend("/run/systemd/seats/", id);
                 return NULL;
 
         s->state_file = strappend("/run/systemd/seats/", id);

-        if (!s->state_file) {
-                free(s);
-                return NULL;
-        }
+        if (!s->state_file)
+                return mfree(s);

 
         s->id = basename(s->state_file);
         s->manager = m;
 
         if (hashmap_put(m->seats, s->id, s) < 0) {
                 free(s->state_file);
 
         s->id = basename(s->state_file);
         s->manager = m;
 
         if (hashmap_put(m->seats, s->id, s) < 0) {
                 free(s->state_file);

-                free(s);
-                return NULL;
+                return mfree(s);

         }
 
         return s;
         }
 
         return s;

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 84e199f6a27f6644c68f2514d2d25a9f60c5c290..b8071264b9533e9d6eac985d8e0d9a969189f31f 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -62,16 +62,13 @@ Session* session_new(Manager *m, const char *id) {
                 return NULL;
 
         s->state_file = strappend("/run/systemd/sessions/", id);
                 return NULL;
 
         s->state_file = strappend("/run/systemd/sessions/", id);

-        if (!s->state_file) {
-                free(s);
-                return NULL;
-        }
+        if (!s->state_file)
+                return mfree(s);

 
         s->devices = hashmap_new(&devt_hash_ops);
         if (!s->devices) {
                 free(s->state_file);
 
         s->devices = hashmap_new(&devt_hash_ops);
         if (!s->devices) {
                 free(s->state_file);

-                free(s);
-                return NULL;
+                return mfree(s);

         }
 
         s->id = basename(s->state_file);
         }
 
         s->id = basename(s->state_file);


@@ -79,8 +76,7 @@ Session* session_new(Manager *m, const char *id) {
         if (hashmap_put(m->sessions, s->id, s) < 0) {
                 hashmap_free(s->devices);
                 free(s->state_file);
         if (hashmap_put(m->sessions, s->id, s) < 0) {
                 hashmap_free(s->devices);
                 free(s->state_file);

-                free(s);
-                return NULL;
+                return mfree(s);

         }
 
         s->manager = m;
         }
 
         s->manager = m;