diff options
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 242c198511..6db9930c30 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 a157ff132b..b46ab4d750 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; } |