ctdb-daemon: Rename struct ctdb_script_wire to ctdb_script

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

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 71e21bd610cc89501cdd79933db6f743d25bd08f..45f0f17ce5d03ce76c464756e70652672f7aa5b0 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -218,7 +218,7 @@ struct ctdb_call_info {
 
 #define MAX_SCRIPT_NAME 31
 #define MAX_SCRIPT_OUTPUT 511
-struct ctdb_script_wire {
+struct ctdb_script {
        char name[MAX_SCRIPT_NAME+1];
        struct timeval start;
        struct timeval finished;
@@ -228,7 +228,7 @@ struct ctdb_script_wire {
 
 struct ctdb_scripts_wire {
        uint32_t num_scripts;
-       struct ctdb_script_wire scripts[1];
+       struct ctdb_script scripts[1];
 };
 
 /* different calls to event scripts. */

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 2c5dfae9165e1e7c6ba76991225a586ffdb90512..789b5b5f5dbef5856c5f5dd4a85be5c1f2046bd2 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -67,7 +67,7 @@ struct ctdb_event_script_state {
        struct ctdb_scripts_wire *scripts;
 };
 
-static struct ctdb_script_wire *get_current_script(struct ctdb_event_script_state *state)
+static struct ctdb_script *get_current_script(struct ctdb_event_script_state *state)
 {
        return &state->scripts->scripts[state->current];
 }
@@ -79,7 +79,7 @@ static void log_event_script_output(const char *str, uint16_t len, void *p)
 {
        struct ctdb_event_script_state *state
                = talloc_get_type(p, struct ctdb_event_script_state);
-       struct ctdb_script_wire *current;
+       struct ctdb_script *current;
        unsigned int slen, min;
 
        /* We may have been aborted to run something else.  Discard */
@@ -197,7 +197,7 @@ static struct ctdb_scripts_wire *ctdb_get_script_list(struct ctdb_context *ctdb,
        scripts->num_scripts = count;
 
        for (i = 0; i < count; i++) {
-               struct ctdb_script_wire *s = &scripts->scripts[i];
+               struct ctdb_script *s = &scripts->scripts[i];
 
                if (strlcpy(s->name, namelist[i]->d_name, sizeof(s->name)) >=
                    sizeof(s->name)) {
@@ -227,7 +227,7 @@ done:
 static bool child_helper_args(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
                              enum ctdb_eventscript_call call,
                              const char *options,
-                             struct ctdb_script_wire *current, int fd,
+                             struct ctdb_script *current, int fd,
                              int *argc, const char ***argv)
 {
        const char **tmp;
@@ -294,7 +294,7 @@ static int fork_child_for_script(struct ctdb_context *ctdb,
 {
        int r;
        struct tevent_fd *fde;
-       struct ctdb_script_wire *current = get_current_script(state);
+       struct ctdb_script *current = get_current_script(state);
        int argc;
        const char **argv;
 
@@ -380,7 +380,7 @@ static void ctdb_event_script_handler(struct tevent_context *ev,
 {
        struct ctdb_event_script_state *state =
                talloc_get_type(p, struct ctdb_event_script_state);
-       struct ctdb_script_wire *current = get_current_script(state);
+       struct ctdb_script *current = get_current_script(state);
        struct ctdb_context *ctdb = state->ctdb;
        int r, status;
 
@@ -542,7 +542,7 @@ static void ctdb_event_script_timeout(struct tevent_context *ev,
 {
        struct ctdb_event_script_state *state = talloc_get_type(p, struct ctdb_event_script_state);
        struct ctdb_context *ctdb = state->ctdb;
-       struct ctdb_script_wire *current = get_current_script(state);
+       struct ctdb_script *current = get_current_script(state);
        struct debug_hung_script_state *debug_state;
 
        DEBUG(DEBUG_ERR,("Event script '%s %s %s' timed out after %.1fs, count: %u, pid: %d\n",