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/lib | |
| parent | 164a7600512d85bb9871f71131927802bbbd879d (diff) | |
| download | samba-3bc4fd1bb9bfbd0e0efd89d47c50bf798e5a1481.tar.gz samba-3bc4fd1bb9bfbd0e0efd89d47c50bf798e5a1481.tar.xz 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/lib')
| -rw-r--r-- | source3/lib/events.c | 3 | ||||
| -rw-r--r-- | source3/lib/smbldap.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/lib/events.c b/source3/lib/events.c index 242c198511e..6db9930c300 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -23,9 +23,8 @@ static struct timed_event *timed_events; -static int timed_event_destructor(void *p) +static int timed_event_destructor(struct timed_event *te) { - struct timed_event *te = talloc_get_type_abort(p, struct timed_event); DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te, te->event_name)); DLIST_REMOVE(timed_events, te); diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index a157ff132b7..b46ab4d750b 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -340,8 +340,7 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = { return result; } - static int ldapmsg_destructor(void *p) { - LDAPMessage **result = talloc_get_type_abort(p, LDAPMessage *); + static int ldapmsg_destructor(LDAPMessage **result) { ldap_msgfree(*result); return 0; } @@ -361,9 +360,8 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = { talloc_set_destructor(handle, ldapmsg_destructor); } - static int ldapmod_destructor(void *p) { - LDAPMod ***result = talloc_get_type_abort(p, LDAPMod **); - ldap_mods_free(*result, True); + static int ldapmod_destructor(LDAPMod ***mod) { + ldap_mods_free(*mod, True); return 0; } |