chiark / gitweb /
tree-wide: remove Lennart's copyright lines
[elogind.git] / src / basic / fileio.c
index 2d742c911cfeb5a1791831ae8b241788ed0f9bfe..60573f2ef84c908be3da2726375d1c09100ddbcf 100644 (file)
@@ -1,9 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-***/
 
 #include <errno.h>
 #include <fcntl.h>
@@ -1571,29 +1566,21 @@ int read_nul_string(FILE *f, char **ret) {
 }
 
 int mkdtemp_malloc(const char *template, char **ret) {
-        _cleanup_free_ char *p = NULL;
-        int r;
+        char *p;
 
+        assert(template);
         assert(ret);
 
-        if (template)
-                p = strdup(template);
-        else {
-                const char *tmp;
-
-                r = tmp_dir(&tmp);
-                if (r < 0)
-                        return r;
-
-                p = strjoin(tmp, "/XXXXXX");
-        }
+        p = strdup(template);
         if (!p)
                 return -ENOMEM;
 
-        if (!mkdtemp(p))
+        if (!mkdtemp(p)) {
+                free(p);
                 return -errno;
+        }
 
-        *ret = TAKE_PTR(p);
+        *ret = p;
         return 0;
 }
 #endif // 0