picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-path: use _cleanup_ attribute

This commit is contained in:
Yu Watanabe 2019-06-21 03:14:05 +09:00
parent 657ee2d82b
commit a13de89d36
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsystemd/sd-path/sd-path.c
View File

@ -325,8 +325,9 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
}
_public_ int sd_path_home(uint64_t type, const char *suffix, char **path) {
char *buffer = NULL, *cc;
_cleanup_free_ char *buffer = NULL;
const char *ret;
char *cc;
int r;
assert_return(path, -EINVAL);
@ -351,7 +352,7 @@ _public_ int sd_path_home(uint64_t type, const char *suffix, char **path) {
if (!buffer)
return -ENOMEM;
*path = buffer;
*path = TAKE_PTR(buffer);
return 0;
}
@ -366,19 +367,16 @@ _public_ int sd_path_home(uint64_t type, const char *suffix, char **path) {
return -ENOMEM;
}
*path = buffer;
*path = TAKE_PTR(buffer);
return 0;
}
suffix += strspn(suffix, "/");
cc = path_join(ret, suffix);
free(buffer);
if (!cc)
return -ENOMEM;
*path = cc;
*path = TAKE_PTR(cc);
return 0;
}