bus-unit-util: trivial follow-up for UnitFreezer

Follow-up for 7483708131b474d92c9207c8c6340b450b58cb94

Make sure that function param names match between
source and header. Also, place UnitFreezer params
in front.

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 536acc874a142d87b1009d48230feb383bde00dc..0fedafd881c384eb9685babab2d24b9d4dc4a966 100644 (file)
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -2966,36 +2966,40 @@ int unit_freezer_new(const char *name, UnitFreezer *ret) {
         return 0;
 }
 
-static int unit_freezer_action(bool freeze, UnitFreezer *f) {
+void unit_freezer_done(UnitFreezer *f) {
+        assert(f);
+
+        f->name = mfree(f->name);
+        f->bus = sd_bus_flush_close_unref(f->bus);
+}
+
+static int unit_freezer_action(UnitFreezer *f, bool freeze) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
 
         assert(f);
-        assert(f->bus);
         assert(f->name);
+        assert(f->bus);
 
-        r = bus_call_method(f->bus, bus_systemd_mgr, freeze ? "FreezeUnit" : "ThawUnit",
-                            &error, NULL, "s", f->name);
+        r = bus_call_method(f->bus, bus_systemd_mgr,
+                            freeze ? "FreezeUnit" : "ThawUnit",
+                            &error,
+                            /* reply = */ NULL,
+                            "s",
+                            f->name);
         if (r < 0)
-                return log_debug_errno(r, "Failed to %s unit %s: %s", freeze ? "freeze" : "thaw",
-                                       f->name, bus_error_message(&error, r));
+                return log_debug_errno(r, "Failed to %s unit %s: %s",
+                                       freeze ? "freeze" : "thaw", f->name, bus_error_message(&error, r));
 
         return 0;
 }
 
 int unit_freezer_freeze(UnitFreezer *f) {
-        return unit_freezer_action(true, f);
+        return unit_freezer_action(f, true);
 }
 
 int unit_freezer_thaw(UnitFreezer *f) {
-        return unit_freezer_action(false, f);
-}
-
-void unit_freezer_done(UnitFreezer *f) {
-        assert(f);
-
-        f->name = mfree(f->name);
-        f->bus = sd_bus_flush_close_unref(f->bus);
+        return unit_freezer_action(f, false);
 }
 
 int unit_freezer_new_freeze(const char *name, UnitFreezer *ret) {

diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h
index 3c6a00106967c74cce62d170e79be276040c28b4..a1518158ff4691f8551064ea8a7db6151fc5eb6f 100644 (file)
--- a/src/shared/bus-unit-util.h
+++ b/src/shared/bus-unit-util.h
@@ -42,13 +42,11 @@ typedef struct UnitFreezer {
 } UnitFreezer;
 
 int unit_freezer_new(const char *name, UnitFreezer *ret);
+void unit_freezer_done(UnitFreezer *f);
 
-int unit_freezer_freeze(UnitFreezer *freezer);
-
-int unit_freezer_thaw(UnitFreezer *freezer);
-
-void unit_freezer_done(UnitFreezer *freezer);
+int unit_freezer_freeze(UnitFreezer *f);
+int unit_freezer_thaw(UnitFreezer *f);
 
 int unit_freezer_new_freeze(const char *name, UnitFreezer *ret);
 
-void unit_freezer_done_thaw(UnitFreezer *freezer);
+void unit_freezer_done_thaw(UnitFreezer *f);