diff options
| -rw-r--r-- | source3/auth/auth_util.c | 5 | ||||
| -rw-r--r-- | source3/lib/events.c | 3 | ||||
| -rw-r--r-- | source3/lib/smbldap.c | 8 | ||||
| -rw-r--r-- | source3/locking/brlock.c | 4 | ||||
| -rw-r--r-- | source3/locking/locking.c | 4 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 4 | ||||
| -rw-r--r-- | source3/utils/netlookup.c | 2 |
7 files changed, 9 insertions, 21 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 26d1eb710f..c2f32f4f95 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -513,11 +513,8 @@ NT_USER_TOKEN *get_root_nt_token( void ) return token; } -static int server_info_dtor(void *p) +static int server_info_dtor(auth_serversupplied_info *server_info) { - auth_serversupplied_info *server_info = - talloc_get_type_abort(p, auth_serversupplied_info); - if (server_info->sam_account != NULL) { TALLOC_FREE(server_info->sam_account); } 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; } 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; diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 55eb31ff84..8229fd68ab 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -50,10 +50,8 @@ const char *my_sam_name(void) /********************************************************************** ***********************************************************************/ -static int samu_destroy(void *p) +static int samu_destroy(struct samu *user) { - struct samu *user = (struct samu *)p; - data_blob_clear_free( &user->lm_pw ); data_blob_clear_free( &user->nt_pw ); diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index b9948485b9..d82630e5c8 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -41,7 +41,7 @@ static struct con_struct *cs; Close connection on context destruction. ********************************************************/ -static int cs_destructor(void *p) +static int cs_destructor(struct con_struct *p) { if (cs->cli) { cli_shutdown(cs->cli); |