From: David Herrmann <dh.herrmann@gmail.com>
Date: Mon, 18 Aug 2014 11:07:43 +0000 (+0200)
Subject: memfd: use _cleanup_ if applicable
X-Git-Tag: v216~61^2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8a02decaf1e81bad3c06752e998734c96ab11260;p=elogind.git

memfd: use _cleanup_ if applicable

We now have a sd_memfd_freep helper, use it if applicable.
---

diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index d94c6268d..e246f915c 100644
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -241,7 +241,7 @@ int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
 }
 
 int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
-        sd_memfd *n;
+        _cleanup_(sd_memfd_freep) sd_memfd *n = NULL;
         int r;
 
         r = sd_memfd_new(&n, name);
@@ -249,18 +249,15 @@ int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
                 return r;
 
         r = sd_memfd_set_size(n, sz);
-        if (r < 0) {
-                sd_memfd_free(n);
+        if (r < 0)
                 return r;
-        }
 
         r = sd_memfd_map(n, 0, sz, p);
-        if (r < 0) {
-                sd_memfd_free(n);
+        if (r < 0)
                 return r;
-        }
 
         *m = n;
+        n = NULL;
         return 0;
 }