diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-28 19:43:48 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:16 +0100 |
| commit | 44e611ddcf8b929cbee48bc83b066d88174bf121 (patch) | |
| tree | cc994736a48364646221c742ee6fa26f0ef541a4 /ctdb/tests | |
| parent | ecfaef503191ab45317cc6a851201ec992d7fb11 (diff) | |
| download | samba-44e611ddcf8b929cbee48bc83b066d88174bf121.tar.gz | |
ctdb-daemon: Rename struct ctdb_control_get_ifaces to ctdb_iface_list_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_test.c | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_test_stubs.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c index 7afc00d6dca..0ef8b8e188a 100644 --- a/ctdb/tests/src/ctdb_test.c +++ b/ctdb/tests/src/ctdb_test.c @@ -114,7 +114,7 @@ int ctdb_ctrl_getnodesfile(struct ctdb_context *ctdb, int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, - struct ctdb_control_get_ifaces **ifaces); + struct ctdb_iface_list_old **ifaces); int ctdb_ctrl_getpnn(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode); int ctdb_ctrl_getrecmode(struct ctdb_context *ctdb, diff --git a/ctdb/tests/src/ctdb_test_stubs.c b/ctdb/tests/src/ctdb_test_stubs.c index ff01f88483f..cd9c97e7bad 100644 --- a/ctdb/tests/src/ctdb_test_stubs.c +++ b/ctdb/tests/src/ctdb_test_stubs.c @@ -544,7 +544,7 @@ int32_t ctdb_control_get_ifaces(struct ctdb_context *ctdb, TDB_DATA *outdata) { int i, num, len; - struct ctdb_control_get_ifaces *ifaces; + struct ctdb_iface_list_old *ifaces; struct ctdb_interface *cur; assert_ifaces_set(ctdb); @@ -555,7 +555,7 @@ int32_t ctdb_control_get_ifaces(struct ctdb_context *ctdb, num++; } - len = offsetof(struct ctdb_control_get_ifaces, ifaces) + + len = offsetof(struct ctdb_iface_list_old, ifaces) + num*sizeof(struct ctdb_iface); ifaces = talloc_zero_size(outdata, len); CTDB_NO_MEMORY(ctdb, ifaces); @@ -573,7 +573,7 @@ int32_t ctdb_control_get_ifaces(struct ctdb_context *ctdb, i++; } ifaces->num = i; - len = offsetof(struct ctdb_control_get_ifaces, ifaces) + + len = offsetof(struct ctdb_iface_list_old, ifaces) + i*sizeof(struct ctdb_iface); outdata->dsize = len; @@ -586,7 +586,7 @@ int ctdb_ctrl_get_ifaces_stub(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, - struct ctdb_control_get_ifaces **ifaces) + struct ctdb_iface_list_old **ifaces) { TDB_DATA *outdata; int ret; @@ -600,7 +600,7 @@ ctdb_ctrl_get_ifaces_stub(struct ctdb_context *ctdb, ret = ctdb_control_get_ifaces(ctdb, NULL, outdata); if (ret == 0) { - *ifaces = (struct ctdb_control_get_ifaces *)outdata->dptr; + *ifaces = (struct ctdb_iface_list_old *)outdata->dptr; } return ret; |