summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-08 18:43:11 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-09 08:19:27 +0200
commita1e58e8ee1c84b633d6d6d651d5328d4dd4eba5b (patch)
tree2c5288c0e505c561c779ea13b4d99e8101803ca2 /src/shared
parentda323858ef34a0216aa96f4089810053c90f09ce (diff)
tree-wide: use coccinelle to patch a lot of code to use mfree()
This replaces this: free(p); p = NULL; by this: p = mfree(p); Change generated using coccinelle. Semantic patch is added to the sources.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/bus-util.c7
-rw-r--r--src/shared/conf-parser.c3
2 files changed, 3 insertions, 7 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index d9cc19700e..36c44227c5 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1884,11 +1884,8 @@ 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;
-
- free(d->result);
- d->result = NULL;
+ d->name = mfree(d->name);
+ d->result = mfree(d->result);
}
return r;
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 36150d8744..23512f0d35 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -232,8 +232,7 @@ static int parse_line(const char* unit,
"Unknown section '%s'. Ignoring.", n);
free(n);
- free(*section);
- *section = NULL;
+ *section = mfree(*section);
*section_line = 0;
*section_ignored = true;
} else {