diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-29 19:14:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:59 -0500 |
| commit | 3bc4fd1bb9bfbd0e0efd89d47c50bf798e5a1481 (patch) | |
| tree | 429afd025bad12ab90486ba4404fc9293f8bdf45 /source3/locking | |
| parent | 164a7600512d85bb9871f71131927802bbbd879d (diff) | |
| download | samba-3bc4fd1bb9bfbd0e0efd89d47c50bf798e5a1481.tar.gz samba-3bc4fd1bb9bfbd0e0efd89d47c50bf798e5a1481.tar.bz2 samba-3bc4fd1bb9bfbd0e0efd89d47c50bf798e5a1481.zip | |
r17924: Get rid of warnings now that talloc is merged.
Destructors now take a pointer to the "real" destroyed object as an argument.
Volker
(This used to be commit 70edd716ef0ccb218fe18d1233bd30abe46b62bf)
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 4 | ||||
| -rw-r--r-- | source3/locking/locking.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 9229d6e6e8..00cbed6b84 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1492,10 +1492,8 @@ int brl_forall(BRLOCK_FN(fn)) Unlock the record. ********************************************************************/ -static int byte_range_lock_destructor(void *p) +static int byte_range_lock_destructor(struct byte_range_lock *br_lck) { - struct byte_range_lock *br_lck = - talloc_get_type_abort(p, struct byte_range_lock); TDB_DATA key; key.dptr = (char *)&br_lck->key; diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 8dd7fafd3b..371f1b474c 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -672,10 +672,8 @@ static TDB_DATA unparse_share_modes(struct share_mode_lock *lck) return result; } -static int share_mode_lock_destructor(void *p) +static int share_mode_lock_destructor(struct share_mode_lock *lck) { - struct share_mode_lock *lck = - talloc_get_type_abort(p, struct share_mode_lock); TDB_DATA key = locking_key(lck->dev, lck->ino); TDB_DATA data; |