diff options
| author | Daniel Mack <github@zonque.org> | 2015-07-31 20:17:33 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-07-31 20:17:33 +0200 |
| commit | 6f7897f9d2bd5ec7d6a9be8ad700661bb17a21cf (patch) | |
| tree | f03d3e452e8433c350616f6ffc7d28b08bd23335 /src/core | |
| parent | 97d09a62836e1c6f807837cf47e83c970cecb06b (diff) | |
| parent | 97b11eedff9d2e17101ad453caf9e48b73246719 (diff) | |
Merge pull request #814 from dvdhrm/mfree
tree-wide: introduce mfree()
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/load-fragment.c | 8 | ||||
| -rw-r--r-- | src/core/main.c | 6 | ||||
| -rw-r--r-- | src/core/snapshot.c | 3 |
3 files changed, 5 insertions, 12 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index a48cb4029a..ba73cc410e 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3508,9 +3508,7 @@ static int load_from_path(Unit *u, const char *path) { r = open_follow(&filename, &f, symlink_names, &id); if (r < 0) { - free(filename); - filename = NULL; - + filename = mfree(filename); if (r != -ENOENT) return r; } @@ -3534,9 +3532,7 @@ static int load_from_path(Unit *u, const char *path) { r = open_follow(&filename, &f, symlink_names, &id); if (r < 0) { - free(filename); - filename = NULL; - + filename = mfree(filename); if (r != -ENOENT) return r; diff --git a/src/core/main.c b/src/core/main.c index 6ae8b51544..a66fb18418 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1844,13 +1844,11 @@ finish: arg_default_rlimit[j] = NULL; } - free(arg_default_unit); - arg_default_unit = NULL; + arg_default_unit = mfree(arg_default_unit); free_join_controllers(); - strv_free(arg_default_environment); - arg_default_environment = NULL; + arg_default_environment = strv_free(arg_default_environment); set_free(arg_syscall_archs); arg_syscall_archs = NULL; diff --git a/src/core/snapshot.c b/src/core/snapshot.c index 1e634b9bc1..9518e21f36 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -217,8 +217,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, break; } - free(n); - n = NULL; + n = mfree(n); } } |