From 74ca738f6a01fb5fc19c5c3899f5cb1fdc1d7f68 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Sep 2015 15:20:10 +0200
Subject: util: introduce safe_fclose() and port everything over to it

Adds a coccinelle script to port things over automatically.
---
 src/journal/coredump.c   | 3 +--
 src/journal/stacktrace.c | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 62483a2a05..7d94b145c9 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -512,8 +512,7 @@ static int compose_open_fds(pid_t pid, char **open_fds) {
         }
 
         errno = 0;
-        fclose(stream);
-        stream = NULL;
+        stream = safe_fclose(stream);
 
         if (errno != 0)
                 return -errno;
diff --git a/src/journal/stacktrace.c b/src/journal/stacktrace.c
index 706c08eac7..98a54ff269 100644
--- a/src/journal/stacktrace.c
+++ b/src/journal/stacktrace.c
@@ -177,8 +177,7 @@ int coredump_make_stack_trace(int fd, const char *executable, char **ret) {
                 goto finish;
         }
 
-        fclose(c.f);
-        c.f = NULL;
+        c.f = safe_fclose(c.f);
 
         *ret = buf;
         buf = NULL;
@@ -192,8 +191,7 @@ finish:
         if (c.elf)
                 elf_end(c.elf);
 
-        if (c.f)
-                fclose(c.f);
+        safe_fclose(c.f);
 
         free(buf);
 
-- 
cgit v1.2.3-54-g00ecf