mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
bus-unit-util: trivial follow-up for UnitFreezer
Follow-up for 7483708131
Make sure that function param names match between
source and header. Also, place UnitFreezer params
in front.
This commit is contained in:
@@ -2966,31 +2966,6 @@ int unit_freezer_new(const char *name, UnitFreezer *ret) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int unit_freezer_action(bool freeze, UnitFreezer *f) {
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->bus);
|
||||
assert(f->name);
|
||||
|
||||
r = bus_call_method(f->bus, bus_systemd_mgr, freeze ? "FreezeUnit" : "ThawUnit",
|
||||
&error, 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 0;
|
||||
}
|
||||
|
||||
int unit_freezer_freeze(UnitFreezer *f) {
|
||||
return unit_freezer_action(true, f);
|
||||
}
|
||||
|
||||
int unit_freezer_thaw(UnitFreezer *f) {
|
||||
return unit_freezer_action(false, f);
|
||||
}
|
||||
|
||||
void unit_freezer_done(UnitFreezer *f) {
|
||||
assert(f);
|
||||
|
||||
@@ -2998,6 +2973,35 @@ void unit_freezer_done(UnitFreezer *f) {
|
||||
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->name);
|
||||
assert(f->bus);
|
||||
|
||||
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 0;
|
||||
}
|
||||
|
||||
int unit_freezer_freeze(UnitFreezer *f) {
|
||||
return unit_freezer_action(f, true);
|
||||
}
|
||||
|
||||
int unit_freezer_thaw(UnitFreezer *f) {
|
||||
return unit_freezer_action(f, false);
|
||||
}
|
||||
|
||||
int unit_freezer_new_freeze(const char *name, UnitFreezer *ret) {
|
||||
_cleanup_(unit_freezer_done) UnitFreezer f = {};
|
||||
int r;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user