From d76bb3c179b7a32b109e39aa87ff09c8f5a8c178 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Mon, 13 Mar 2017 09:20:24 +0100 Subject: [PATCH] Unifiy free() usage This commit substitutes all occurrences of free(foo); foo = NULL; with foo = mfree(foo); --- src/basic/strv.c | 3 +-- src/libelogind/sd-bus/bus-creds.c | 6 ++---- src/libelogind/sd-bus/bus-message.c | 3 +-- src/libelogind/sd-bus/sd-bus.c | 6 ++---- src/login/logind-dbus.c | 3 +-- src/login/logind-inhibit.c | 3 +-- src/login/logind-session.c | 3 +-- src/login/logind-user.c | 3 +-- src/shared/bus-util.c | 6 ++---- 9 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/basic/strv.c b/src/basic/strv.c index 9decbb419..dab34d8e7 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -276,8 +276,7 @@ char **strv_split_newlines(const char *s) { return l; if (isempty(l[n-1])) { - free(l[n-1]); - l[n-1] = NULL; + l[n-1] = mfree(l[n-1]); } return l; diff --git a/src/libelogind/sd-bus/bus-creds.c b/src/libelogind/sd-bus/bus-creds.c index 7c763a2e7..4fccae503 100644 --- a/src/libelogind/sd-bus/bus-creds.c +++ b/src/libelogind/sd-bus/bus-creds.c @@ -107,8 +107,7 @@ _public_ sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c) { free(c->cgroup_root); free(c->description); - free(c->supplementary_gids); - c->supplementary_gids = NULL; + c->supplementary_gids = mfree(c->supplementary_gids); strv_free(c->well_known_names); c->well_known_names = NULL; @@ -1049,8 +1048,7 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) { return r; } else { if (c->cmdline_size == 0) { - free(c->cmdline); - c->cmdline = NULL; + c->cmdline = mfree(c->cmdline); } c->mask |= SD_BUS_CREDS_CMDLINE; diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c index 378d1af1a..36b8ebea0 100644 --- a/src/libelogind/sd-bus/bus-message.c +++ b/src/libelogind/sd-bus/bus-message.c @@ -113,8 +113,7 @@ static void message_reset_containers(sd_bus_message *m) { free(m->containers[i].offsets); } - free(m->containers); - m->containers = NULL; + m->containers = mfree(m->containers); m->n_containers = m->containers_allocated = 0; m->root_container.index = 0; diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index 2ccfacbdf..6acc9f386 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -829,8 +829,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) b->machine = machine; machine = NULL; } else { - free(b->machine); - b->machine = NULL; + b->machine = mfree(b->machine); } if (pid) { @@ -889,8 +888,7 @@ static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid b->machine = machine; machine = NULL; } else { - free(b->machine); - b->machine = NULL; + b->machine = mfree(b->machine); } if (pid) { diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 5dedbfc90..800e2a51b 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1998,8 +1998,7 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd m->scheduled_shutdown_timeout_source = sd_event_source_unref(m->scheduled_shutdown_timeout_source); m->wall_message_timeout_source = sd_event_source_unref(m->wall_message_timeout_source); m->nologin_timeout_source = sd_event_source_unref(m->nologin_timeout_source); - free(m->scheduled_shutdown_type); - m->scheduled_shutdown_type = NULL; + m->scheduled_shutdown_type = mfree(m->scheduled_shutdown_type); m->scheduled_shutdown_timeout = 0; if (cancelled) { diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index cfae186ed..0c9c1e5e9 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -333,8 +333,7 @@ void inhibitor_remove_fifo(Inhibitor *i) { if (i->fifo_path) { unlink(i->fifo_path); - free(i->fifo_path); - i->fifo_path = NULL; + i->fifo_path = mfree(i->fifo_path); } } diff --git a/src/login/logind-session.c b/src/login/logind-session.c index c7033bd18..bbfbeac53 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -984,8 +984,7 @@ static void session_remove_fifo(Session *s) { if (s->fifo_path) { unlink(s->fifo_path); - free(s->fifo_path); - s->fifo_path = NULL; + s->fifo_path = mfree(s->fifo_path); } } diff --git a/src/login/logind-user.c b/src/login/logind-user.c index e5833ef50..63adc8210 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -590,8 +590,7 @@ static int user_remove_runtime_path(User *u) { if (r < 0) log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); - free(u->runtime_path); - u->runtime_path = NULL; + u->runtime_path = mfree(u->runtime_path); return r; } diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index b72bb8278..1e80ebcf6 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1904,11 +1904,9 @@ int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet) { log_debug_errno(q, "Got result %s/%m for job %s", strna(d->result), strna(d->name)); } - free(d->name); - d->name = NULL; + d->name = mfree(d->name); - free(d->result); - d->result = NULL; + d->result = mfree(d->result); } return r; -- 2.30.2