diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-04-04 17:31:11 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-06-07 16:05:26 +0200 |
| commit | 6894158103f77d1905edd3ebcc09e00695b12f5d (patch) | |
| tree | 70427687b4f8475883f89e19cde540e4f00be9ae /ctdb/client | |
| parent | 103f3a3cbe71375664297ea1a4cd29ef486090cb (diff) | |
| download | samba-6894158103f77d1905edd3ebcc09e00695b12f5d.tar.gz | |
ctdb-client: Rename ctdb_db_travese to ctdb_db_traverse_local
This function only traverses the database on local node.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/client')
| -rw-r--r-- | ctdb/client/client.h | 6 | ||||
| -rw-r--r-- | ctdb/client/client_db.c | 24 |
2 files changed, 16 insertions, 14 deletions
diff --git a/ctdb/client/client.h b/ctdb/client/client.h index 312615e2d4f..2205112b4f1 100644 --- a/ctdb/client/client.h +++ b/ctdb/client/client.h @@ -695,9 +695,9 @@ int ctdb_detach(TALLOC_CTX *mem_ctx, struct tevent_context *ev, uint32_t ctdb_db_id(struct ctdb_db_context *db); -int ctdb_db_traverse(struct ctdb_db_context *db, bool readonly, - bool extract_header, - ctdb_rec_parser_func_t parser, void *private_data); +int ctdb_db_traverse_local(struct ctdb_db_context *db, bool readonly, + bool extract_header, + ctdb_rec_parser_func_t parser, void *private_data); int ctdb_ltdb_fetch(struct ctdb_db_context *db, TDB_DATA key, struct ctdb_ltdb_header *header, diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c index 888cfbc3592..cb3dc44c529 100644 --- a/ctdb/client/client_db.c +++ b/ctdb/client/client_db.c @@ -624,18 +624,19 @@ uint32_t ctdb_db_id(struct ctdb_db_context *db) return db->db_id; } -struct ctdb_db_traverse_state { +struct ctdb_db_traverse_local_state { ctdb_rec_parser_func_t parser; void *private_data; bool extract_header; int error; }; -static int ctdb_db_traverse_handler(struct tdb_context *tdb, TDB_DATA key, - TDB_DATA data, void *private_data) +static int ctdb_db_traverse_local_handler(struct tdb_context *tdb, + TDB_DATA key, TDB_DATA data, + void *private_data) { - struct ctdb_db_traverse_state *state = - (struct ctdb_db_traverse_state *)private_data; + struct ctdb_db_traverse_local_state *state = + (struct ctdb_db_traverse_local_state *)private_data; int ret; if (state->extract_header) { @@ -660,11 +661,11 @@ static int ctdb_db_traverse_handler(struct tdb_context *tdb, TDB_DATA key, return 0; } -int ctdb_db_traverse(struct ctdb_db_context *db, bool readonly, - bool extract_header, - ctdb_rec_parser_func_t parser, void *private_data) +int ctdb_db_traverse_local(struct ctdb_db_context *db, bool readonly, + bool extract_header, + ctdb_rec_parser_func_t parser, void *private_data) { - struct ctdb_db_traverse_state state; + struct ctdb_db_traverse_local_state state; int ret; state.parser = parser; @@ -674,10 +675,11 @@ int ctdb_db_traverse(struct ctdb_db_context *db, bool readonly, if (readonly) { ret = tdb_traverse_read(db->ltdb->tdb, - ctdb_db_traverse_handler, &state); + ctdb_db_traverse_local_handler, + &state); } else { ret = tdb_traverse(db->ltdb->tdb, - ctdb_db_traverse_handler, &state); + ctdb_db_traverse_local_handler, &state); } if (ret == -1) { |