ctdb-daemon: Rename struct ctdb_scripts_wire to ctdb_script_list_old

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 28f4358fcb721e5fe3bd28092ca9cf3c7083f750..ca02e07ab55b40f7e37018b427079cbd45c25213 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4452,10 +4452,11 @@ int switch_from_server_to_client(struct ctdb_context *ctdb, const char *fmt, ...
 /*
   get the status of running the monitor eventscripts: NULL means never run.
  */
-int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb, 
-               struct timeval timeout, uint32_t destnode, 
-               TALLOC_CTX *mem_ctx, enum ctdb_eventscript_call type,
-               struct ctdb_scripts_wire **scripts)
+int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
+                             struct timeval timeout, uint32_t destnode,
+                             TALLOC_CTX *mem_ctx,
+                             enum ctdb_eventscript_call type,
+                             struct ctdb_script_list_old **scripts)
 {
        int ret;
        TDB_DATA outdata, indata;
@@ -4476,10 +4477,10 @@ int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
        if (outdata.dsize == 0) {
                *scripts = NULL;
        } else {
-               *scripts = (struct ctdb_scripts_wire *)talloc_memdup(mem_ctx, outdata.dptr, outdata.dsize);
+               *scripts = (struct ctdb_script_list_old *)talloc_memdup(mem_ctx, outdata.dptr, outdata.dsize);
                talloc_free(outdata.dptr);
        }
-                   
+
        return 0;
 }
 

diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index 12bf806340602f1b7216a8891a4b9010a4e26174..8b75eb27177815addfe0fb6b6a61c4aacbab4935 100644 (file)
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -568,7 +568,7 @@ int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
                              struct timeval timeout, uint32_t destnode,
                              TALLOC_CTX *mem_ctx,
                              enum ctdb_eventscript_call type,
-                             struct ctdb_scripts_wire **script_status);
+                             struct ctdb_script_list_old **script_status);
 
 int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb,
                                       struct timeval timeout, double latency);

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 5e0efc8dc4eda4c7d15c151391a97ea1b159b122..8930a9142d732b053d12189814289d81991606f4 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -365,7 +365,7 @@ struct ctdb_context {
        int active_events;
 
        struct ctdb_event_script_state *current_monitor;
-       struct ctdb_scripts_wire *last_status[CTDB_EVENT_MAX];
+       struct ctdb_script_list_old *last_status[CTDB_EVENT_MAX];
 
        TALLOC_CTX *banning_ctx;
 

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 45f0f17ce5d03ce76c464756e70652672f7aa5b0..9ad6231cfcbcc9fd6b5cafa4b509439490b8c6a1 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -226,7 +226,7 @@ struct ctdb_script {
        char output[MAX_SCRIPT_OUTPUT+1];
 };
 
-struct ctdb_scripts_wire {
+struct ctdb_script_list_old {
        uint32_t num_scripts;
        struct ctdb_script scripts[1];
 };

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 789b5b5f5dbef5856c5f5dd4a85be5c1f2046bd2..0286c610aeb5bc006a21ed006f0d1269df8dec32 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -64,7 +64,7 @@ struct ctdb_event_script_state {
        struct timeval timeout;
 
        unsigned int current;
-       struct ctdb_scripts_wire *scripts;
+       struct ctdb_script_list_old *scripts;
 };
 
 static struct ctdb_script *get_current_script(struct ctdb_event_script_state *state)
@@ -170,10 +170,12 @@ static bool check_executable(const char *dir, const char *name)
        return true;
 }
 
-static struct ctdb_scripts_wire *ctdb_get_script_list(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx)
+static struct ctdb_script_list_old *ctdb_get_script_list(
+                                               struct ctdb_context *ctdb,
+                                               TALLOC_CTX *mem_ctx)
 {
        struct dirent **namelist;
-       struct ctdb_scripts_wire *scripts;
+       struct ctdb_script_list_old *scripts;
        int i, count;
 
        /* scan all directory entries and insert all valid scripts into the
@@ -350,7 +352,7 @@ static int fork_child_for_script(struct ctdb_context *ctdb,
 /*
  Summarize status of this run of scripts.
  */
-static int script_status(struct ctdb_scripts_wire *scripts)
+static int script_status(struct ctdb_script_list_old *scripts)
 {
        unsigned int i;
 

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index d731fb4da42b8339268abfcc602d6e860eaad0bd..514e4a4c581479aa7979f3d26eeac5991df75e97 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -1408,7 +1408,7 @@ done:
 static int control_one_scriptstatus(struct ctdb_context *ctdb,
                                    enum ctdb_eventscript_call type)
 {
-       struct ctdb_scripts_wire *script_status;
+       struct ctdb_script_list_old *script_status;
        int ret, i;
 
        ret = ctdb_ctrl_getscriptstatus(ctdb, TIMELIMIT(), options.pnn, ctdb, type, &script_status);