From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Feb 2018 17:45:28 +0000 (+0100)
Subject: journal-upload: make use of safe_close() where appropriate
X-Git-Tag: v238~51^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ccf323dfd70eaf010ad51f416af9414ae24486f;p=thirdparty%2Fsystemd.git

journal-upload: make use of safe_close() where appropriate
---

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 0b74ca98a70..3094785618c 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -328,9 +328,7 @@ static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user
 static void close_fd_input(Uploader *u) {
         assert(u);
 
-        if (u->input >= 0)
-                close_nointr(u->input);
-        u->input = -1;
+        u->input = safe_close(u->input);
         u->timeout = 0;
 }