diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-10-17 07:12:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 07:12:20 +0200 |
| commit | a7753693547233e4a1d6e10b1a8f6515a477f227 (patch) | |
| tree | 3b20f53b931e953f4ed495bb10e90597f3670237 /src/basic/fs-util.c | |
| parent | 9e7727521ff2e751ee064716ab735016abf72025 (diff) | |
| parent | 3b319885c4febb5f7ea9b5ab31c3395548ed6886 (diff) | |
Merge pull request #4391 from keszybz/treewide-macros
Use mfree more and add another function to simplify a common set&free pattern
Diffstat (limited to 'src/basic/fs-util.c')
| -rw-r--r-- | src/basic/fs-util.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 86d9ad7e36..48952a1c26 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -678,9 +678,7 @@ int chase_symlinks(const char *path, const char *_root, char **ret) { !path_startswith(parent, root)) return -EINVAL; - free(done); - done = parent; - parent = NULL; + free_and_replace(done, parent); fd_parent = openat(fd, "..", O_CLOEXEC|O_NOFOLLOW|O_PATH); if (fd_parent < 0) @@ -724,9 +722,7 @@ int chase_symlinks(const char *path, const char *_root, char **ret) { if (fd < 0) return -errno; - free(buffer); - buffer = destination; - destination = NULL; + free_and_replace(buffer, destination); todo = buffer; free(done); |