ctdb-common: Rename run_event_script_list to run_event_list

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/common/run_event.c b/ctdb/common/run_event.c
index c78d956f588ccef0fadeb57523cfebb8e6d8c8c1..aba9014bbaf80220109251f92d2fb08526e4087c 100644 (file)
--- a/ctdb/common/run_event.c
+++ b/ctdb/common/run_event.c
@@ -389,9 +389,9 @@ static int run_event_script_status(struct run_event_script *script)
        return ret;
 }
 
-int run_event_script_list(struct run_event_context *run_ctx,
-                         TALLOC_CTX *mem_ctx,
-                         struct run_event_script_list **output)
+int run_event_list(struct run_event_context *run_ctx,
+                  TALLOC_CTX *mem_ctx,
+                  struct run_event_script_list **output)
 {
        struct run_event_script_list *script_list;
        int ret, i;

diff --git a/ctdb/common/run_event.h b/ctdb/common/run_event.h
index 72878e150a55e9b6a5dc3876c493a199688b7dd7..361ef56e398a4d824038a7d00ab64f79e213283e 100644 (file)
--- a/ctdb/common/run_event.h
+++ b/ctdb/common/run_event.h
@@ -87,9 +87,9 @@ int run_event_init(TALLOC_CTX *mem_ctx, struct run_proc_context *run_proc_ctx,
  * @param[out] output List of valid scripts
  * @return 0 on success, errno on failure
  */
-int run_event_script_list(struct run_event_context *run_ctx,
-                         TALLOC_CTX *mem_ctx,
-                         struct run_event_script_list **output);
+int run_event_list(struct run_event_context *run_ctx,
+                  TALLOC_CTX *mem_ctx,
+                  struct run_event_script_list **output);
 
 /**
  * @brief Enable a script

diff --git a/ctdb/server/ctdb_eventd.c b/ctdb/server/ctdb_eventd.c
index f1c8a8c8fec8568cb9385ca9ca42de6556802806..586870c05af3b46326b03d95ee088a819dde968b 100644 (file)
--- a/ctdb/server/ctdb_eventd.c
+++ b/ctdb/server/ctdb_eventd.c
@@ -436,8 +436,7 @@ static struct tevent_req *command_script_list_send(
                return tevent_req_post(req, ev);
        }
 
-       ret = run_event_script_list(eventd_run_context(ectx), state->reply,
-                                   &s);
+       ret = run_event_list(eventd_run_context(ectx), state->reply, &s);
        if (ret != 0) {
                tevent_req_error(req, ret);
                return tevent_req_post(req, ev);

diff --git a/ctdb/tests/src/run_event_test.c b/ctdb/tests/src/run_event_test.c
index ddee92ed8240c90145dc35024cd4a046ad21e2a0..9baee3d9111562a9cb4757530f1fb5e893267d2a 100644 (file)
--- a/ctdb/tests/src/run_event_test.c
+++ b/ctdb/tests/src/run_event_test.c
@@ -110,7 +110,7 @@ static void do_list(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
        struct run_event_script_list *script_list = NULL;
        int ret, i;
 
-       ret = run_event_script_list(run_ctx, mem_ctx, &script_list);
+       ret = run_event_list(run_ctx, mem_ctx, &script_list);
        if (ret != 0) {
                printf("Script list failed with result=%d\n", ret);
                return;