machine: minor refactoring, making machine_send_signal() invocations more readable

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 69159f4eb0e629c44790ff42070e1784dc27b090..6bee74fd300967462ead4b9466e63f929c31b64b 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -870,12 +870,11 @@ const BusObjectImplementation machine_object = {
         .node_enumerator = machine_node_enumerator,
 };
 
-int machine_send_signal(Machine *m, bool new_machine) {
-        _cleanup_free_ char *p = NULL;
-
+int machine_send_signal(Machine *m, const char *signal_name) {
         assert(m);
+        assert(signal_name);
 
-        p = machine_bus_path(m);
+        _cleanup_free_ char *p = machine_bus_path(m);
         if (!p)
                 return -ENOMEM;
 
@@ -883,7 +882,7 @@ int machine_send_signal(Machine *m, bool new_machine) {
                         m->manager->api_bus,
                         "/org/freedesktop/machine1",
                         "org.freedesktop.machine1.Manager",
-                        new_machine ? "MachineNew" : "MachineRemoved",
+                        signal_name,
                         "so", m->name, p);
 }
 

diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h
index 7fd025f7b3102f0ab2d64612958c4e333088bd06..38ea10b295a7053ae6be2b69cf79895e710a85a9 100644 (file)
--- a/src/machine/machine-dbus.h
+++ b/src/machine/machine-dbus.h
@@ -26,5 +26,5 @@ int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_erro
 int bus_machine_method_open_root_directory(sd_bus_message *message, void *userdata, sd_bus_error *error);
 int bus_machine_method_get_uid_shift(sd_bus_message *message, void *userdata, sd_bus_error *error);
 
-int machine_send_signal(Machine *m, bool new_machine);
+int machine_send_signal(Machine *m, const char *signal_name);
 int machine_send_create_reply(Machine *m, sd_bus_error *error);

diff --git a/src/machine/machine.c b/src/machine/machine.c
index ff376c7047cee8a11ab8aaab7671c4f0760b1212..0350c16df682363c8695ad1c0c911598e9f52421 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -672,7 +672,7 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) {
         /* Save new machine data */
         machine_save(m);
 
-        machine_send_signal(m, true);
+        machine_send_signal(m, "MachineNew");
 
         return 0;
 }
@@ -730,7 +730,7 @@ int machine_finalize(Machine *m) {
         machine_add_to_gc_queue(m);
 
         if (m->started) {
-                machine_send_signal(m, false);
+                machine_send_signal(m, "MachineRemoved");
                 m->started = false;
         }