summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2011-12-07 13:40:24 +1100
committerMartin Schwenke <martin@meltin.net>2011-12-08 17:21:24 +1100
commit89b01c8e7b32f7f5d9eeef1b01b2b9d1e778f48a (patch)
tree96ea051873d092c650c522a3cc3fe178e85d9c81
parenta2095caf91ffc2c052816773d4e8f1777841f9cc (diff)
downloadsamba-89b01c8e7b32f7f5d9eeef1b01b2b9d1e778f48a.tar.gz
samba-89b01c8e7b32f7f5d9eeef1b01b2b9d1e778f48a.tar.xz
samba-89b01c8e7b32f7f5d9eeef1b01b2b9d1e778f48a.zip
Rename struct traverse_state to allow tools C files to be #included.
Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit 54377ef8b992f92d3a4ece42ee72e37d22cd2de6)
-rw-r--r--ctdb/tools/ctdb_vacuum.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/tools/ctdb_vacuum.c b/ctdb/tools/ctdb_vacuum.c
index 419e660a7f..3bde7b384d 100644
--- a/ctdb/tools/ctdb_vacuum.c
+++ b/ctdb/tools/ctdb_vacuum.c
@@ -478,7 +478,7 @@ int ctdb_vacuum(struct ctdb_context *ctdb, int argc, const char **argv)
return 0;
}
-struct traverse_state {
+struct vacuum_traverse_state {
bool error;
struct tdb_context *dest_db;
};
@@ -488,7 +488,7 @@ struct traverse_state {
*/
static int repack_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *private)
{
- struct traverse_state *state = (struct traverse_state *)private;
+ struct vacuum_traverse_state *state = (struct vacuum_traverse_state *)private;
if (tdb_store(state->dest_db, key, data, TDB_INSERT) != 0) {
state->error = true;
return -1;
@@ -502,7 +502,7 @@ static int repack_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
static int ctdb_repack_tdb(struct tdb_context *tdb)
{
struct tdb_context *tmp_db;
- struct traverse_state state;
+ struct vacuum_traverse_state state;
if (tdb_transaction_start(tdb) != 0) {
DEBUG(DEBUG_ERR,(__location__ " Failed to start transaction\n"));