diff options
Diffstat (limited to 'systemd.c')
| -rw-r--r-- | systemd.c | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -36,10 +36,7 @@ systemd_service_object_path(struct cfg *cfg, const char *service) char *d; const char *s; - if (empty_str(service)) { - error("invalid arguments"); - return NULL; - } + assert_return(cfg && service && !empty_str(service), NULL); r = zmalloc(strlen(SYSTEMD_DBUS_PATH_PREFIX) + strlen(service) * 3 + 1); if (!r) @@ -68,8 +65,8 @@ systemd_service_object_path(struct cfg *cfg, const char *service) void systemd_delete(struct cfg *cfg) { - if (!cfg->sd_bus) - return; + assert_return(cfg); + assert_return_silent(cfg->sd_bus); sd_bus_unref(cfg->sd_bus); cfg->sd_bus = NULL; @@ -80,6 +77,8 @@ get_bus(struct cfg *cfg) { int r; + assert_return(cfg, NULL); + if (cfg->sd_bus_failed) return NULL; @@ -112,11 +111,10 @@ systemd_service_running(struct cfg *cfg, struct server *server) sd_bus *bus = get_bus(cfg); sd_bus_error error = SD_BUS_ERROR_NULL; char *status = NULL; - int r; bool running = false; + int r; - if (!bus || !server->systemd_service || !server->systemd_obj) - return false; + assert_return(cfg && server && bus && server->systemd_service && server->systemd_obj, false); r = sd_bus_get_property_string(bus, SYSTEMD_DBUS_SERVICE, @@ -155,8 +153,7 @@ systemd_service_action(struct cfg *cfg, struct server *server, const char *actio bool performed = false; int r; - if (!bus || !server->systemd_service || !server->systemd_obj || !action) - return false; + assert_return(cfg && server && bus && server->systemd_service && server->systemd_obj && action, false); r = sd_bus_call_method(bus, SYSTEMD_DBUS_SERVICE, @@ -201,6 +198,8 @@ out: bool systemd_service_stop(struct cfg *cfg, struct server *server) { + assert_return(cfg && server, false); + return systemd_service_action(cfg, server, "Stop"); } @@ -216,6 +215,8 @@ systemd_service_stop(struct cfg *cfg, struct server *server) bool systemd_service_start(struct cfg *cfg, struct server *server) { + assert_return(cfg && server, false); + return systemd_service_action(cfg, server, "Start"); } |