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

nspawn: avoid one strdup by using free_and_replace

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-11-07 08:54:47 -05:00
parent f0a4feb0a5
commit 49fedb4094
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/namespace.c
View file

@ -678,8 +678,9 @@ static int chase_all_symlinks(const char *root_directory, BindMount *m, unsigned
* chase the symlinks on our own first. This call wil do so for all entries and remove all entries where we
* can't resolve the path, and which have been marked for such removal. */
for (f = m, t = m; f < m+*n; f++) {
for (f = m, t = m; f < m + *n; f++) {
_cleanup_free_ char *chased = NULL;
r = chase_symlinks(f->path, root_directory, &chased);
if (r == -ENOENT && f->ignore) {
/* Doesn't exist? Then remove it! */
@ -691,7 +692,7 @@ static int chase_all_symlinks(const char *root_directory, BindMount *m, unsigned
if (!path_equal(f->path, chased)) {
log_debug("Chased %s → %s", f->path, chased);
r = free_and_strdup(&f->path, chased);
r = free_and_replace(f->path, chased);
if (r < 0)
return r;
}