From 054bf2fc8bd8ac62e16ec04001c0a4a8409d0e1d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 28 May 2007 11:38:42 +0000 Subject: r23171: Convert connections.tdb to dbwrap (This used to be commit 80a1f43825063bbbda896175d99700ede5a4757a) --- source3/utils/net_status.c | 4 ++-- source3/utils/smbcontrol.c | 7 ++++--- source3/utils/status.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c index 88c1789f71..80fba51b37 100644 --- a/source3/utils/net_status.c +++ b/source3/utils/net_status.c @@ -84,7 +84,7 @@ static int net_status_sessions(int argc, const char **argv) return 0; } -static int show_share(TDB_CONTEXT *tdb, +static int show_share(struct db_record *rec, const struct connections_key *key, const struct connections_data *crec, void *state) @@ -134,7 +134,7 @@ static int collect_pid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, return 0; } -static int show_share_parseable(TDB_CONTEXT *tdb, +static int show_share_parseable(struct db_record *rec, const struct connections_key *key, const struct connections_data *crec, void *state) diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 4f388637ad..2b927adb96 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -243,9 +243,10 @@ cleanup: ptrace(PTRACE_DETACH, pid, NULL, NULL); } -static int stack_trace_connection(TDB_CONTEXT * tdb, +static int stack_trace_connection(struct db_record *rec, const struct connections_key *key, - const struct connections_data *conn, + const struct connections_data *crec, + void *priv) { print_stack_trace(procid_to_pid(&conn->pid), (int *)priv); @@ -278,7 +279,7 @@ static BOOL do_daemon_stack_trace(struct messaging_context *msg_ctx, */ print_stack_trace(dest, &count); } else { - connections_traverse(stack_trace_connection, &count); + connections_forall(stack_trace_connection, &count); } return True; diff --git a/source3/utils/status.c b/source3/utils/status.c index aa014c8410..a797c9c4ba 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -188,7 +188,7 @@ static void print_brl(SMB_DEV_T dev, (double)start, (double)size); } -static int traverse_fn1(TDB_CONTEXT *tdb, +static int traverse_fn1(struct db_record *rec, const struct connections_key *key, const struct connections_data *crec, void *state) -- cgit