diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-06-21 14:29:25 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2016-07-04 15:42:23 +0200 |
| commit | 4d20babddf169eca35ebde912bdd34920c4cec80 (patch) | |
| tree | a9b31ccaa94806d5a86e4b0451b0fde2ec253f86 /ctdb/tests/src/ctdb_takeover_tests.c | |
| parent | fcc373e3c3041715092adbcf69986d0ae683837c (diff) | |
| download | samba-4d20babddf169eca35ebde912bdd34920c4cec80.tar.gz | |
ctdb-tests: Don't bother setting all_ips
It isn't used outside this function. Instead, update k directly.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/src/ctdb_takeover_tests.c')
| -rw-r--r-- | ctdb/tests/src/ctdb_takeover_tests.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c index c832834907c..3bf4d14dabd 100644 --- a/ctdb/tests/src/ctdb_takeover_tests.c +++ b/ctdb/tests/src/ctdb_takeover_tests.c @@ -66,11 +66,9 @@ read_ctdb_public_ip_info(TALLOC_CTX *ctx , char line[1024]; ctdb_sock_addr addr; char *t, *tok; - struct public_ip_list * ta; - int pnn, numips, n, i; + int pnn, numips, n; struct ctdb_public_ip_list * k; - struct public_ip_list *last = NULL; enum ctdb_runstate *runstate; runstate = get_runstate(ctx, numnodes); @@ -123,19 +121,7 @@ read_ctdb_public_ip_info(TALLOC_CTX *ctx , pnn = (int) strtol(tok, (char **) NULL, 10); } - /* Add address + pnn to all_ips */ - if (last == NULL) { - last = talloc(ctx, struct public_ip_list); - } else { - last->next = talloc(ctx, struct public_ip_list); - last = last->next; - } - last->next = NULL; - last->pnn = pnn; - memcpy(&(last->addr), &addr, sizeof(addr)); - if (*all_ips == NULL) { - *all_ips = last; - } + add_ip(k, k, &addr, pnn); tok = strtok(NULL, " \t#"); if (tok == NULL) { @@ -152,10 +138,6 @@ read_ctdb_public_ip_info(TALLOC_CTX *ctx , } - for (ta = *all_ips, i=0; ta != NULL && i < numips ; ta = ta->next, i++) { - add_ip(k, k, &ta->addr, ta->pnn); - } - /* Assign it to any nodes that don't have a list assigned */ for (n = 0; n < numnodes; n++) { if ((*known)[n].num == 0) { |