From: Jeremy Allison Date: Wed, 28 Jun 2006 22:33:10 +0000 (+0000) Subject: r16661: Fix from jason@ncac.gwu.edu for bug #3875, X-Git-Tag: samba-4.0.0alpha6~801^2~8132 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=cc1457beb00faa6869e2472e305b4e97c0995ea3;p=samba.git r16661: Fix from jason@ncac.gwu.edu for bug #3875, bad cast warning. Jeremy. (This used to be commit d60e6e0abc17361fe180d6723b970552dc377741) --- diff --git a/source3/include/smb.h b/source3/include/smb.h index 5aa06347f8c..e0f2e8483cb 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -869,6 +869,12 @@ struct byte_range_lock { enum brl_flavour lock_flav, \ br_off start, br_off size) +#define LOCKING_FN_CAST() \ + void (*)(struct share_mode_entry *, const char *, const char *) + +#define LOCKING_FN(fn) \ + void (*fn)(struct share_mode_entry *, const char *, const char *) + struct bitmap { uint32 *b; unsigned int n; diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 01f12bbb58d..9d3ca956014 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -1274,7 +1274,7 @@ static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, const char *sharepath; const char *fname; int i; - void (*traverse_callback)(struct share_mode_entry *, const char *, const char *) = state; + LOCKING_FN(traverse_callback) = (LOCKING_FN_CAST())state; /* Ensure this is a locking_key record. */ if (kbuf.dsize != sizeof(struct locking_key))