From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 30 Apr 2019 07:28:10 +0000 (+0200)
Subject: tmpfile-util: simplify umask reset declaration
X-Git-Tag: v243-rc1~360^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8a8579e84bf5cb33d2c331efd74ffeaf8072539;p=thirdparty%2Fsystemd.git

tmpfile-util: simplify umask reset declaration
---

diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c
index e77af7659f0..5100d6a5ff9 100644
--- a/src/basic/tmpfile-util.c
+++ b/src/basic/tmpfile-util.c
@@ -58,13 +58,11 @@ int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
 
 /* This is much like mkostemp() but is subject to umask(). */
 int mkostemp_safe(char *pattern) {
-        _cleanup_umask_ mode_t u = 0;
+        _unused_ _cleanup_umask_ mode_t u = umask(0077);
         int fd;
 
         assert(pattern);
 
-        u = umask(077);
-
         fd = mkostemp(pattern, O_CLOEXEC);
         if (fd < 0)
                 return -errno;