From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Jun 2023 11:07:53 +0000 (+0200)
Subject: transaction: drop bus error arg from transaction_add_propagate_reload_jobs()
X-Git-Tag: v254-rc1~165^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F28087%2Fhead;p=thirdparty%2Fsystemd.git

transaction: drop bus error arg from transaction_add_propagate_reload_jobs()

We erase the error anyway always, hence no point in even passing
anything in from callers.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 34a6d7db2cd..23df5ce1913 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2147,8 +2147,7 @@ int manager_propagate_reload(Manager *m, Unit *unit, JobMode mode, sd_bus_error
                         tr,
                         unit,
                         tr->anchor_job,
-                        mode == JOB_IGNORE_DEPENDENCIES ? TRANSACTION_IGNORE_ORDER : 0,
-                        e);
+                        mode == JOB_IGNORE_DEPENDENCIES ? TRANSACTION_IGNORE_ORDER : 0);
 
         r = transaction_activate(tr, m, mode, NULL, e);
         if (r < 0)
diff --git a/src/core/transaction.c b/src/core/transaction.c
index dda17c6c16b..9c1523c47ad 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -878,8 +878,7 @@ void transaction_add_propagate_reload_jobs(
                 Transaction *tr,
                 Unit *unit,
                 Job *by,
-                TransactionAddFlags flags,
-                sd_bus_error *e) {
+                TransactionAddFlags flags) {
 
         JobType nt;
         Unit *dep;
@@ -889,17 +888,17 @@ void transaction_add_propagate_reload_jobs(
         assert(unit);
 
         UNIT_FOREACH_DEPENDENCY(dep, unit, UNIT_ATOM_PROPAGATES_RELOAD_TO) {
+                _cleanup_(sd_bus_error_free) sd_bus_error e = SD_BUS_ERROR_NULL;
+
                 nt = job_type_collapse(JOB_TRY_RELOAD, dep);
                 if (nt == JOB_NOP)
                         continue;
 
-                r = transaction_add_job_and_dependencies(tr, nt, dep, by, flags, e);
-                if (r < 0) {
+                r = transaction_add_job_and_dependencies(tr, nt, dep, by, flags, &e);
+                if (r < 0)
                         log_unit_warning(dep,
                                          "Cannot add dependency reload job, ignoring: %s",
-                                         bus_error_message(e, r));
-                        sd_bus_error_free(e);
-                }
+                                         bus_error_message(&e, r));
         }
 }
 
@@ -1099,7 +1098,7 @@ int transaction_add_job_and_dependencies(
                 }
 
                 if (type == JOB_RELOAD)
-                        transaction_add_propagate_reload_jobs(tr, ret->unit, ret, flags & TRANSACTION_IGNORE_ORDER, e);
+                        transaction_add_propagate_reload_jobs(tr, ret->unit, ret, flags & TRANSACTION_IGNORE_ORDER);
 
                 /* JOB_VERIFY_ACTIVE requires no dependency handling */
         }
diff --git a/src/core/transaction.h b/src/core/transaction.h
index 6ee0872c273..5874077aefd 100644
--- a/src/core/transaction.h
+++ b/src/core/transaction.h
@@ -30,8 +30,7 @@ typedef enum TransactionAddFlags {
 void transaction_add_propagate_reload_jobs(
                 Transaction *tr,
                 Unit *unit, Job *by,
-                TransactionAddFlags flags,
-                sd_bus_error *e);
+                TransactionAddFlags flags);
 
 int transaction_add_job_and_dependencies(
                 Transaction *tr,