diff options
| author | Luke Leighton <lkcl@samba.org> | 2000-02-04 04:59:31 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 2000-02-04 04:59:31 +0000 |
| commit | bbe275e95b86bc7af5a641455cbb379974823f84 (patch) | |
| tree | 9dfa5cc96c8634b5a5810414109560fd5d4391b4 /source3/tdb/tdbtool.c | |
| parent | ae7696117e81bb469fa71f9bc880f6b5aac0724e (diff) | |
| download | samba-bbe275e95b86bc7af5a641455cbb379974823f84.tar.gz samba-bbe275e95b86bc7af5a641455cbb379974823f84.tar.bz2 samba-bbe275e95b86bc7af5a641455cbb379974823f84.zip | |
1) added void* state argument to tdb_traverse. guess what! there were
two places i found where it was appropriate to _use_ that third argument,
in locking.c and brlock.c! there was a static traverse_function and
i removed the static variable, typecast it to a void*, passed it to
tdb_traverse and re-cast it back to the traverse_function inside the
tdb_traverse function. this makes the use of tdb_traverse() reentrant,
which is never going to happen, i know, i just don't like to see
statics lying about when there's no need for them.
as i had to do in samba-tng, all uses of tdb_traverse modified to take
the new void* state argument.
2) disabled rpcclient: referring people to use SAMBA_TNG rpcclient.
i don't know how the other samba team members would react if i deleted
rpcclient from cvs main. damn, that code's so old, it's unreal.
20 rpcclient commands, instead of about 70 in SAMBA_TNG.
(This used to be commit 49d7f0afbc1c5425d53019e234d54ddf205c8e9a)
Diffstat (limited to 'source3/tdb/tdbtool.c')
| -rw-r--r-- | source3/tdb/tdbtool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/tdb/tdbtool.c b/source3/tdb/tdbtool.c index b1c7e2774f..76b6259ef8 100644 --- a/source3/tdb/tdbtool.c +++ b/source3/tdb/tdbtool.c @@ -134,7 +134,7 @@ static void delete_tdb(void) } } -static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf) +static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state) { printf("%*.*s : %*.*s\n", (int)key.dsize, (int)key.dsize, key.dptr, @@ -144,7 +144,7 @@ static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf) static int total_bytes; -static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf) +static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state) { total_bytes += dbuf.dsize; return 0; @@ -154,7 +154,7 @@ static void info_tdb(void) { int count; total_bytes = 0; - count = tdb_traverse(tdb, traverse_fn); + count = tdb_traverse(tdb, traverse_fn, NULL); printf("%d records totalling %d bytes\n", count, total_bytes); } @@ -199,11 +199,11 @@ int main(int argc, char *argv[]) } else if (strcmp(tok,"show") == 0) { show_tdb(); } else if (strcmp(tok,"erase") == 0) { - tdb_traverse(tdb, tdb_delete); + tdb_traverse(tdb, tdb_delete, NULL); } else if (strcmp(tok,"delete") == 0) { delete_tdb(); } else if (strcmp(tok,"dump") == 0) { - tdb_traverse(tdb, print_rec); + tdb_traverse(tdb, print_rec, NULL); } else if (strcmp(tok,"info") == 0) { info_tdb(); } else { |