summaryrefslogtreecommitdiff
path: root/src/basic/fileio.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-01-10 17:11:19 +0100
committerSven Eden <yamakuzure@gmx.net>2018-05-30 07:50:03 +0200
commit843a078dc2b5e0d416c078475466df225d0c99ae (patch)
tree7e49f72cd5482b0c02178b2264456e18fcbc5d46 /src/basic/fileio.c
parentee48474e9555de15ce709f327054a2c747698c93 (diff)
cocci: use strempty() at more places
This shortens the code by a few lines.
Diffstat (limited to 'src/basic/fileio.c')
-rw-r--r--src/basic/fileio.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 8906c0b82..c16ef3b1e 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1231,8 +1231,7 @@ int tempfn_xxxxxx(const char *p, const char *extra, char **ret) {
if (!filename_is_valid(fn))
return -EINVAL;
- if (!extra)
- extra = "";
+ extra = strempty(extra);
t = new(char, strlen(p) + 2 + strlen(extra) + 6 + 1);
if (!t)
@@ -1265,8 +1264,7 @@ int tempfn_random(const char *p, const char *extra, char **ret) {
if (!filename_is_valid(fn))
return -EINVAL;
- if (!extra)
- extra = "";
+ extra = strempty(extra);
t = new(char, strlen(p) + 2 + strlen(extra) + 16 + 1);
if (!t)
@@ -1307,8 +1305,7 @@ int tempfn_random_child(const char *p, const char *extra, char **ret) {
return r;
}
- if (!extra)
- extra = "";
+ extra = strempty(extra);
t = new(char, strlen(p) + 3 + strlen(extra) + 16 + 1);
if (!t)