diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-05-24 07:34:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:32 -0500 |
| commit | 971d30bb201f5c3faff5f575d26882eb79f7955a (patch) | |
| tree | aad4df492eb9c8bf1e105c8bac65dc315b27a1cd /source4/ntvfs/common | |
| parent | cdc64c448df49676c96f87d106af8de0c467651f (diff) | |
| download | samba-971d30bb201f5c3faff5f575d26882eb79f7955a.tar.gz samba-971d30bb201f5c3faff5f575d26882eb79f7955a.tar.bz2 samba-971d30bb201f5c3faff5f575d26882eb79f7955a.zip | |
r15854: more talloc_set_destructor() typesafe fixes
(This used to be commit 61c6100617589ac6df4f527877241464cacbf8b3)
Diffstat (limited to 'source4/ntvfs/common')
| -rw-r--r-- | source4/ntvfs/common/notify.c | 3 | ||||
| -rw-r--r-- | source4/ntvfs/common/opendb.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index 57cbce3863..222bd7a927 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -63,9 +63,8 @@ static void notify_handler(struct messaging_context *msg_ctx, void *private, /* destroy the notify context */ -static int notify_destructor(void *p) +static int notify_destructor(struct notify_context *notify) { - struct notify_context *notify = talloc_get_type(p, struct notify_context); messaging_deregister(notify->messaging_ctx, MSG_PVFS_NOTIFY, notify); notify_remove_all(notify); return 0; diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c index 395e6c6dbf..d83ecdc6f2 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -100,9 +100,8 @@ _PUBLIC_ struct odb_context *odb_init(TALLOC_CTX *mem_ctx, /* destroy a lock on the database */ -static int odb_lock_destructor(void *ptr) +static int odb_lock_destructor(struct odb_lock *lck) { - struct odb_lock *lck = ptr; tdb_chainunlock(lck->odb->w->tdb, lck->key); return 0; } |