From 0f8261015380be71f8a63c8aa37926c2a32d1870 Mon Sep 17 00:00:00 2001 From: Umut Tezduyar Lindskog Date: Wed, 8 Jul 2015 14:35:32 +0200 Subject: property callback returns are consistent It is no different to return 0 over 1 in the property callback. It is confusing to return 1 which made me think 1 has a special purpose. This way code is consistent with the rest of the tree. --- src/machine/machine-dbus.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/machine') diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 7813a0bcc7..38a4c7b0e7 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -61,11 +61,7 @@ static int property_get_id( assert(reply); assert(m); - r = sd_bus_message_append_array(reply, 'y', &m->id, 16); - if (r < 0) - return r; - - return 1; + return sd_bus_message_append_array(reply, 'y', &m->id, 16); } static int property_get_state( @@ -112,11 +108,7 @@ static int property_get_netif( assert_cc(sizeof(int) == sizeof(int32_t)); - r = sd_bus_message_append_array(reply, 'i', m->netif, m->n_netif * sizeof(int)); - if (r < 0) - return r; - - return 1; + return sd_bus_message_append_array(reply, 'i', m->netif, m->n_netif * sizeof(int)); } static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_class, machine_class, MachineClass); -- cgit v1.2.3-54-g00ecf