summaryrefslogtreecommitdiff
path: root/src/basic/fileio.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/basic/fileio.c')
-rw-r--r--src/basic/fileio.c24
1 files changed, 7 insertions, 17 deletions
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 2d742c911..afe2fd17b 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
/***
- This file is part of systemd.
-
Copyright 2010 Lennart Poettering
***/
@@ -1571,29 +1569,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