diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-04-10 17:38:58 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-04-10 18:00:27 +0200 |
| commit | 6f4706b79e37754c83677e81396e783dde243b39 (patch) | |
| tree | 5f49ef66202cb26e57ab36964b81c233335f9c54 /dbus-unit.c | |
| parent | b152adec93b05c0d01b240e0f28326eb1d8e18e9 (diff) | |
dbus: add generic DEFINE_BUS_PROPERTY_APPEND_ENUM() macro for enum properties
Diffstat (limited to 'dbus-unit.c')
| -rw-r--r-- | dbus-unit.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/dbus-unit.c b/dbus-unit.c index 4ce94e2f7e..de5236a64e 100644 --- a/dbus-unit.c +++ b/dbus-unit.c @@ -94,22 +94,7 @@ static int bus_unit_append_description(Manager *m, DBusMessageIter *i, const cha return 0; } -static int bus_unit_append_load_state(Manager *m, DBusMessageIter *i, const char *property, void *data) { - Unit *u = data; - const char *state; - - assert(m); - assert(i); - assert(property); - assert(u); - - state = unit_load_state_to_string(u->meta.load_state); - - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state)) - return -ENOMEM; - - return 0; -} +DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_load_state, unit_load_state, UnitLoadState); static int bus_unit_append_active_state(Manager *m, DBusMessageIter *i, const char *property, void *data) { Unit *u = data; @@ -215,7 +200,7 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message const BusProperty properties[] = { { "org.freedesktop.systemd1.Unit", "Id", bus_unit_append_id, "s", u }, { "org.freedesktop.systemd1.Unit", "Description", bus_unit_append_description, "s", u }, - { "org.freedesktop.systemd1.Unit", "LoadState", bus_unit_append_load_state, "s", u }, + { "org.freedesktop.systemd1.Unit", "LoadState", bus_unit_append_load_state, "s", &u->meta.load_state }, { "org.freedesktop.systemd1.Unit", "ActiveState", bus_unit_append_active_state, "s", u }, { "org.freedesktop.systemd1.Unit", "FragmentPath", bus_property_append_string, "s", u->meta.fragment_path }, { "org.freedesktop.systemd1.Unit", "ActiveEnterTimestamp", bus_property_append_uint64, "t", &u->meta.active_enter_timestamp }, |