diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-29 17:22:48 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:14 +0100 |
| commit | afc5d8a4420c7c235ab54f938a3f3a77d4309665 (patch) | |
| tree | ebb1cd331c189d13e303063ed16efe5d594a2eda /ctdb/tests | |
| parent | c43b381b71140913a59471d8000e3b2c804bf3f4 (diff) | |
| download | samba-afc5d8a4420c7c235ab54f938a3f3a77d4309665.tar.gz | |
ctdb-daemon: Rename struct ctdb_node_map to ctdb_node_map_old
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/src/ctdb_takeover_tests.c | 4 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_test.c | 6 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_test_stubs.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c index 7ff87557258..7fc7dec1994 100644 --- a/ctdb/tests/src/ctdb_takeover_tests.c +++ b/ctdb/tests/src/ctdb_takeover_tests.c @@ -416,7 +416,7 @@ static void ctdb_test_init(const char nodestates[], int i, numnodes; uint32_t nodeflags[CTDB_TEST_MAX_NODES]; char *tok, *ns, *t; - struct ctdb_node_map *nodemap; + struct ctdb_node_map_old *nodemap; uint32_t *tval_noiptakeover; uint32_t *tval_noiptakeoverondisabled; enum ctdb_runstate *runstate; @@ -469,7 +469,7 @@ static void ctdb_test_init(const char nodestates[], runstate = get_runstate(*ctdb, numnodes); - nodemap = talloc_array(*ctdb, struct ctdb_node_map, numnodes); + nodemap = talloc_array(*ctdb, struct ctdb_node_map_old, numnodes); nodemap->num = numnodes; if (!read_ips_for_multiple_nodes) { diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c index 33f198a5153..7afc00d6dca 100644 --- a/ctdb/tests/src/ctdb_test.c +++ b/ctdb/tests/src/ctdb_test.c @@ -106,11 +106,11 @@ struct tevent_context *tevent_context_init(TALLOC_CTX *mem_ctx); int ctdb_ctrl_getnodemap(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, struct ctdb_node_map **nodemap); + TALLOC_CTX *mem_ctx, struct ctdb_node_map_old **nodemap); int ctdb_ctrl_getnodesfile(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, - struct ctdb_node_map **nodemap); + struct ctdb_node_map_old **nodemap); int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, @@ -164,7 +164,7 @@ struct ctdb_node_capabilities * ctdb_get_capabilities(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx, struct timeval timeout, - struct ctdb_node_map *nodemap); + struct ctdb_node_map_old *nodemap); #undef TIMELIMIT diff --git a/ctdb/tests/src/ctdb_test_stubs.c b/ctdb/tests/src/ctdb_test_stubs.c index f8bf2221d90..3a04c170aaa 100644 --- a/ctdb/tests/src/ctdb_test_stubs.c +++ b/ctdb/tests/src/ctdb_test_stubs.c @@ -433,7 +433,7 @@ int ctdb_ctrl_getnodemap_stub(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, - struct ctdb_node_map **nodemap) + struct ctdb_node_map_old **nodemap) { assert_nodes_set(ctdb); @@ -450,7 +450,7 @@ ctdb_ctrl_getnodemap_stub(struct ctdb_context *ctdb, int ctdb_ctrl_getnodesfile_stub(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, struct ctdb_node_map **nodemap) + TALLOC_CTX *mem_ctx, struct ctdb_node_map_old **nodemap) { char *v, *f; @@ -824,7 +824,7 @@ ctdb_client_async_control_stub(struct ctdb_context *ctdb, res = 0; break; case CTDB_CONTROL_GET_NODES_FILE: { - struct ctdb_node_map *nodemap; + struct ctdb_node_map_old *nodemap; res = ctdb_ctrl_getnodesfile_stub(ctdb, timeout, pnn, tmp_ctx, &nodemap); if (res == 0) { @@ -860,7 +860,7 @@ struct ctdb_node_capabilities * ctdb_get_capabilities_stub(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx, struct timeval timeout, - struct ctdb_node_map *nodemap) + struct ctdb_node_map_old *nodemap) { return global_caps; } |