renaming of verbs

[src/app-framework-main.git] / src / afm-user-daemon.c

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index aecea8d..e71e011 100644 (file)
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -246,7 +246,7 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void
                                        && j_add_string(resp, "uri", uri))
                jbus_reply_j(smsg, resp);
        else {
-               afm_run_stop(runid);
+               afm_run_terminate(runid);
                jbus_reply_error_s(smsg, error_system);
        }
        json_object_put(resp);
@@ -254,29 +254,47 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void
 }
 
 /*
- * On query "stop" from 'smsg' with parameters of 'obj'.
+ * On query "pause" from 'smsg' with parameters of 'obj'.
  */
-static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+static void on_pause(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
 {
        int runid, status;
-       if (onrunid(smsg, obj, "stop", &runid)) {
-               status = afm_run_stop(runid);
+       if (onrunid(smsg, obj, "pause", &runid)) {
+               status = afm_run_pause(runid);
                reply_status(smsg, status, error_not_found);
        }
 }
 
 /*
- * On query "continue" from 'smsg' with parameters of 'obj'.
+ * On query "resume" from 'smsg' with parameters of 'obj'.
  */
-static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+static void on_resume(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
 {
        int runid, status;
-       if (onrunid(smsg, obj, "continue", &runid)) {
-               status = afm_run_continue(runid);
+       if (onrunid(smsg, obj, "resume", &runid)) {
+               status = afm_run_resume(runid);
                reply_status(smsg, status, error_not_found);
        }
 }
 
+/*
+ * On query "stop" from 'smsg' with parameters of 'obj'.
+ */
+static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+{
+       NOTICE("call to obsolete 'stop'");
+       on_pause(smsg, obj, unused);
+}
+
+/*
+ * On query "continue" from 'smsg' with parameters of 'obj'.
+ */
+static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+{
+       NOTICE("call to obsolete 'continue'");
+       on_resume(smsg, obj, unused);
+}
+
 /*
  * On query "terminate" from 'smsg' with parameters of 'obj'.
  */
@@ -583,17 +601,20 @@ int main(int ac, char **av)
         || jbus_add_service_j(user_bus, "detail",    on_detail, NULL)
         || jbus_add_service_j(user_bus, "start",     on_start, NULL)
         || jbus_add_service_j(user_bus, "terminate", on_terminate, NULL)
+        || jbus_add_service_j(user_bus, "pause",     on_pause, NULL)
+        || jbus_add_service_j(user_bus, "resume",    on_resume, NULL)
         || jbus_add_service_j(user_bus, "stop",      on_stop, NULL)
         || jbus_add_service_j(user_bus, "continue",  on_continue, NULL)
         || jbus_add_service_j(user_bus, "runners",   on_runners, NULL)
         || jbus_add_service_j(user_bus, "state",     on_state, NULL)
 #if defined(EXPLICIT_CALL)
         || jbus_add_service_s(user_bus, "install",   on_install, NULL)
-        || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)) {
+        || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)
 #else
         || jbus_add_service_s(user_bus, "install",   (void (*)(struct sd_bus_message *, const char *, void *))propagate, "install")
-        || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "uninstall")) {
+        || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "uninstall")
 #endif
+        ) {
                ERROR("adding services failed");
                return 1;
        }