From bbe275e95b86bc7af5a641455cbb379974823f84 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Fri, 4 Feb 2000 04:59:31 +0000 Subject: 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) --- source3/include/smb.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source3/include/smb.h') diff --git a/source3/include/smb.h b/source3/include/smb.h index f386cfa898..f0ed34bd40 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -686,6 +686,12 @@ typedef struct } share_mode_entry; +#define SHAREMODE_FN_CAST() \ + void (*)(share_mode_entry *, char*) + +#define SHAREMODE_FN(fn) \ + void (*fn)(share_mode_entry *, char*) + /* each implementation of the share mode code needs to support the following operations */ struct share_ops { @@ -833,6 +839,14 @@ struct enum_list { char *name; }; +#define BRLOCK_FN_CAST() \ + void (*)(SMB_DEV_T dev, SMB_INO_T ino, int pid, \ + enum brl_type lock_type, \ + br_off start, br_off size) +#define BRLOCK_FN(fn) \ + void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, int pid, \ + enum brl_type lock_type, \ + br_off start, br_off size) struct parm_struct { char *label; -- cgit