SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nspawn: use automatic cleanup

Browse Source 
This one actually clears up a (totally harmless) memleak.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2012-09-16 16:20:09 +02:00
parent ede89845a4
commit 6b2d0e85dc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+2 -4
View File
@@ -46,6 +46,7 @@
#include "log.h" #include "log.h"
#include "util.h" #include "util.h"
#include "mkdir.h" #include "mkdir.h"
#include "macro.h"
#include "audit.h" #include "audit.h"
#include "missing.h" #include "missing.h"
#include "cgroup-util.h" #include "cgroup-util.h"
@@ -283,7 +284,7 @@ static int mount_all(const char *dest) {
unsigned k; unsigned k;
int r = 0; int r = 0;
char *where; char _cleanup_free_ *where = NULL;
for (k = 0; k < ELEMENTSOF(mount_table); k++) { for (k = 0; k < ELEMENTSOF(mount_table); k++) {
int t; int t;
@@ -300,7 +301,6 @@ static int mount_all(const char *dest) {
t = path_is_mount_point(where, true); t = path_is_mount_point(where, true);
if (t < 0) { if (t < 0) {
log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t)); log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t));
free(where);
if (r == 0) if (r == 0)
r = t; r = t;
@@ -326,8 +326,6 @@ static int mount_all(const char *dest) {
if (r == 0) if (r == 0)
r = -errno; r = -errno;
} }
free(where);
} }
return r; return r;