Major cleanup of all leftovers after rebasing on master.

[elogind.git] / src / shared / bus-util.c

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index b72bb8278750eb8fa44d9574f6cb7481ec8e0ffb..dc8727c8fbe704725e03b77d7dc79357e9f8e555 100644 (file)
--- 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;
@@ -1926,6 +1924,16 @@ int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path) {
         return set_put_strdup(d->jobs, path);
 }
 
+int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet) {
+        int r;
+
+        r = bus_wait_for_jobs_add(d, path);
+        if (r < 0)
+                return log_oom();
+
+        return bus_wait_for_jobs(d, quiet);
+}
+
 int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, UnitFileChange **changes, unsigned *n_changes) {
         const char *type, *path, *source;
         int r;