ctdb-daemon: Rename enum ctdb_eventscript_call to ctdb_event

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

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index ca02e07ab55b40f7e37018b427079cbd45c25213..3d337771c6aa17af24f797ac96ed560326f929c8 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4455,7 +4455,7 @@ int switch_from_server_to_client(struct ctdb_context *ctdb, const char *fmt, ...
 int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
                              struct timeval timeout, uint32_t destnode,
                              TALLOC_CTX *mem_ctx,
 int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
                              struct timeval timeout, uint32_t destnode,
                              TALLOC_CTX *mem_ctx,

-                             enum ctdb_eventscript_call type,
+                             enum ctdb_event type,

                              struct ctdb_script_list_old **scripts)
 {
        int ret;
                              struct ctdb_script_list_old **scripts)
 {
        int ret;

diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index 8b75eb27177815addfe0fb6b6a61c4aacbab4935..aed9d53ce16d6f75909c9ec0473f803eb3b31f69 100644 (file)
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -567,7 +567,7 @@ int switch_from_server_to_client(struct ctdb_context *ctdb,
 int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
                              struct timeval timeout, uint32_t destnode,
                              TALLOC_CTX *mem_ctx,
 int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
                              struct timeval timeout, uint32_t destnode,
                              TALLOC_CTX *mem_ctx,

-                             enum ctdb_eventscript_call type,
+                             enum ctdb_event type,

                              struct ctdb_script_list_old **script_status);
 
 int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb,
                              struct ctdb_script_list_old **script_status);
 
 int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb,

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 8930a9142d732b053d12189814289d81991606f4..2a2b322a515da716e604332f375d03f75045e6f4 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1082,15 +1082,15 @@ int ctdb_event_script_callback(struct ctdb_context *ctdb,
                               void (*callback)(struct ctdb_context *,
                                                int, void *),
                               void *private_data,
                               void (*callback)(struct ctdb_context *,
                                                int, void *),
                               void *private_data,

-                              enum ctdb_eventscript_call call,
+                              enum ctdb_event call,

                               const char *fmt, ...) PRINTF_ATTRIBUTE(6,7);
 
 int ctdb_event_script_args(struct ctdb_context *ctdb,
                               const char *fmt, ...) PRINTF_ATTRIBUTE(6,7);
 
 int ctdb_event_script_args(struct ctdb_context *ctdb,

-                          enum ctdb_eventscript_call call,
+                          enum ctdb_event call,

                           const char *fmt, ...) PRINTF_ATTRIBUTE(3,4);
 
 int ctdb_event_script(struct ctdb_context *ctdb,
                           const char *fmt, ...) PRINTF_ATTRIBUTE(3,4);
 
 int ctdb_event_script(struct ctdb_context *ctdb,

-                     enum ctdb_eventscript_call call);
+                     enum ctdb_event call);

 
 int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
                              struct ctdb_req_control *c,
 
 int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
                              struct ctdb_req_control *c,

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 9ad6231cfcbcc9fd6b5cafa4b509439490b8c6a1..159fe2e8d41410b70ec5afaab4e4d230f9947029 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -232,7 +232,7 @@ struct ctdb_script_list_old {
 };
 
 /* different calls to event scripts. */
 };
 
 /* different calls to event scripts. */

-enum ctdb_eventscript_call {
+enum ctdb_event {

        CTDB_EVENT_INIT,                /* CTDB starting up: no args */
        CTDB_EVENT_SETUP,               /* CTDB starting up after transport is readdy: no args. */
        CTDB_EVENT_STARTUP,             /* CTDB starting up after initial recovery: no args. */
        CTDB_EVENT_INIT,                /* CTDB starting up: no args */
        CTDB_EVENT_SETUP,               /* CTDB starting up after transport is readdy: no args. */
        CTDB_EVENT_STARTUP,             /* CTDB starting up after initial recovery: no args. */

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 0286c610aeb5bc006a21ed006f0d1269df8dec32..b847e5adf8c305ecf367c31752fa5c85ae36e9c9 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -59,7 +59,7 @@ struct ctdb_event_script_state {
        struct event_script_callback *callback;
        pid_t child;
        int fd[2];
        struct event_script_callback *callback;
        pid_t child;
        int fd[2];

-       enum ctdb_eventscript_call call;
+       enum ctdb_event call;

        const char *options;
        struct timeval timeout;
 
        const char *options;
        struct timeval timeout;
 


@@ -227,7 +227,7 @@ done:
 #define MAX_HELPER_ARGS                (10)
 
 static bool child_helper_args(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
 #define MAX_HELPER_ARGS                (10)
 
 static bool child_helper_args(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,

-                             enum ctdb_eventscript_call call,
+                             enum ctdb_event call,

                              const char *options,
                              struct ctdb_script *current, int fd,
                              int *argc, const char ***argv)
                              const char *options,
                              struct ctdb_script *current, int fd,
                              int *argc, const char ***argv)


@@ -441,7 +441,7 @@ static void ctdb_event_script_handler(struct tevent_context *ev,
 struct debug_hung_script_state {
        struct ctdb_context *ctdb;
        pid_t child;
 struct debug_hung_script_state {
        struct ctdb_context *ctdb;
        pid_t child;

-       enum ctdb_eventscript_call call;
+       enum ctdb_event call;

 };
 
 static int debug_hung_script_state_destructor(struct debug_hung_script_state *state)
 };
 
 static int debug_hung_script_state_destructor(struct debug_hung_script_state *state)


@@ -667,7 +667,7 @@ static unsigned int count_words(const char *options)
        return words;
 }
 
        return words;
 }
 

-static bool check_options(enum ctdb_eventscript_call call, const char *options)
+static bool check_options(enum ctdb_event call, const char *options)

 {
        switch (call) {
        /* These all take no arguments. */
 {
        switch (call) {
        /* These all take no arguments. */


@@ -689,7 +689,7 @@ static bool check_options(enum ctdb_eventscript_call call, const char *options)
                return count_words(options) == 4;
 
        default:
                return count_words(options) == 4;
 
        default:

-               DEBUG(DEBUG_ERR,(__location__ "Unknown ctdb_eventscript_call %u\n", call));
+               DEBUG(DEBUG_ERR,(__location__ "Unknown ctdb_event %u\n", call));

                return false;
        }
 }
                return false;
        }
 }


@@ -708,7 +708,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
                                        const void *mem_ctx,
                                        void (*callback)(struct ctdb_context *, int, void *),
                                        void *private_data,
                                        const void *mem_ctx,
                                        void (*callback)(struct ctdb_context *, int, void *),
                                        void *private_data,

-                                       enum ctdb_eventscript_call call,
+                                       enum ctdb_event call,

                                        const char *fmt, va_list ap)
 {
        struct ctdb_event_script_state *state;
                                        const char *fmt, va_list ap)
 {
        struct ctdb_event_script_state *state;


@@ -716,7 +716,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
        if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
                /* we guarantee that only some specifically allowed event scripts are run
                   while in recovery */
        if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
                /* we guarantee that only some specifically allowed event scripts are run
                   while in recovery */

-               const enum ctdb_eventscript_call allowed_calls[] = {
+               const enum ctdb_event allowed_calls[] = {

                        CTDB_EVENT_INIT,
                        CTDB_EVENT_SETUP,
                        CTDB_EVENT_START_RECOVERY,
                        CTDB_EVENT_INIT,
                        CTDB_EVENT_SETUP,
                        CTDB_EVENT_START_RECOVERY,


@@ -853,7 +853,7 @@ int ctdb_event_script_callback(struct ctdb_context *ctdb,
                               TALLOC_CTX *mem_ctx,
                               void (*callback)(struct ctdb_context *, int, void *),
                               void *private_data,
                               TALLOC_CTX *mem_ctx,
                               void (*callback)(struct ctdb_context *, int, void *),
                               void *private_data,

-                              enum ctdb_eventscript_call call,
+                              enum ctdb_event call,

                               const char *fmt, ...)
 {
        va_list ap;
                               const char *fmt, ...)
 {
        va_list ap;


@@ -886,7 +886,7 @@ static void event_script_callback(struct ctdb_context *ctdb, int status, void *p
   run the event script, waiting for it to complete. Used when the caller
   doesn't want to continue till the event script has finished.
  */
   run the event script, waiting for it to complete. Used when the caller
   doesn't want to continue till the event script has finished.
  */

-int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call call,
+int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_event call,

                           const char *fmt, ...)
 {
        va_list ap;
                           const char *fmt, ...)
 {
        va_list ap;


@@ -921,7 +921,7 @@ int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call
        return status.status;
 }
 
        return status.status;
 }
 

-int ctdb_event_script(struct ctdb_context *ctdb, enum ctdb_eventscript_call call)
+int ctdb_event_script(struct ctdb_context *ctdb, enum ctdb_event call)

 {
        /* GCC complains about empty format string, so use %s and "". */
        return ctdb_event_script_args(ctdb, call, "%s", "");
 {
        /* GCC complains about empty format string, so use %s and "". */
        return ctdb_event_script_args(ctdb, call, "%s", "");


@@ -961,7 +961,7 @@ static void run_eventscripts_callback(struct ctdb_context *ctdb, int status,
 
 
 /* Returns rest of string, or NULL if no match. */
 
 
 /* Returns rest of string, or NULL if no match. */

-static const char *get_call(const char *p, enum ctdb_eventscript_call *call)
+static const char *get_call(const char *p, enum ctdb_event *call)

 {
        unsigned int len;
 
 {
        unsigned int len;
 


@@ -991,7 +991,7 @@ int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
        int ret;
        struct eventscript_callback_state *state;
        const char *options;
        int ret;
        struct eventscript_callback_state *state;
        const char *options;

-       enum ctdb_eventscript_call call;
+       enum ctdb_event call;

 
        /* Figure out what call they want. */
        options = get_call((const char *)indata.dptr, &call);
 
        /* Figure out what call they want. */
        options = get_call((const char *)indata.dptr, &call);

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 514e4a4c581479aa7979f3d26eeac5991df75e97..64b8a6c40de302f5a95f011d8f8915e95f1af6b3 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -1406,7 +1406,7 @@ done:
   display the status of the scripts for monitoring (or other events)
  */
 static int control_one_scriptstatus(struct ctdb_context *ctdb,
   display the status of the scripts for monitoring (or other events)
  */
 static int control_one_scriptstatus(struct ctdb_context *ctdb,

-                                   enum ctdb_eventscript_call type)
+                                   enum ctdb_event type)

 {
        struct ctdb_script_list_old *script_status;
        int ret, i;
 {
        struct ctdb_script_list_old *script_status;
        int ret, i;


@@ -1508,7 +1508,7 @@ static int control_scriptstatus(struct ctdb_context *ctdb,
                                int argc, const char **argv)
 {
        int ret;
                                int argc, const char **argv)
 {
        int ret;

-       enum ctdb_eventscript_call type, min, max;
+       enum ctdb_event type, min, max;

        const char *arg;
 
        if (argc > 1) {
        const char *arg;
 
        if (argc > 1) {