diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-09 09:57:29 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-09 09:57:29 +0200 |
| commit | 0fa7d1f5be847d4804eb3bf6a4c10333ea14e0bc (patch) | |
| tree | 6afb70cc560bd94219f81495ff699c83b404e18c /src/core/manager.c | |
| parent | bed2c013b6570908a114a337632000cf9c9de838 (diff) | |
| parent | ece174c5439021e32ebcc858842de9586072c006 (diff) | |
Merge pull request #1207 from poettering/coccinelle-fixes
Coccinelle fixes
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 56f2c92feb..d918007bb8 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -674,8 +674,7 @@ static int manager_setup_notify(Manager *m) { static const int one = 1; /* First free all secondary fields */ - free(m->notify_socket); - m->notify_socket = NULL; + m->notify_socket = mfree(m->notify_socket); m->notify_event_source = sd_event_source_unref(m->notify_event_source); fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); @@ -2793,10 +2792,8 @@ static void trim_generator_dir(Manager *m, char **generator) { if (!*generator) return; - if (rmdir(*generator) >= 0) { - free(*generator); - *generator = NULL; - } + if (rmdir(*generator) >= 0) + *generator = mfree(*generator); return; } @@ -2866,8 +2863,7 @@ static void remove_generator_dir(Manager *m, char **generator) { strv_remove(m->lookup_paths.unit_path, *generator); (void) rm_rf(*generator, REMOVE_ROOT); - free(*generator); - *generator = NULL; + *generator = mfree(*generator); } static void manager_undo_generators(Manager *m) { |