sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

r17924: Get rid of warnings now that talloc is merged.

Browse Source 
Destructors now take a pointer to the "real" destroyed object as an argument.

Volker
This commit is contained in:
Volker Lendecke
2006-08-29 19:14:25 +00:00
committed by Gerald (Jerry) Carter
parent ae313ab4ca
commit 70edd716ef
7 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/auth/auth_util.c
View File

@ -513,11 +513,8 @@ NT_USER_TOKEN *get_root_nt_token( void )
return token; 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) { if (server_info->sam_account != NULL) {
TALLOC_FREE(server_info->sam_account); TALLOC_FREE(server_info->sam_account);
} }

3
source/lib/events.c
View File

@ -23,9 +23,8 @@
static struct timed_event *timed_events; 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, DEBUG(10, ("Destroying timed event %lx \"%s\"\n", (unsigned long)te,
te->event_name)); te->event_name));
DLIST_REMOVE(timed_events, te); DLIST_REMOVE(timed_events, te);

8
source/lib/smbldap.c
View File

@ -340,8 +340,7 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = {
return result; return result;
} }
static int ldapmsg_destructor(void *p) { static int ldapmsg_destructor(LDAPMessage **result) {
LDAPMessage **result = talloc_get_type_abort(p, LDAPMessage *);
ldap_msgfree(*result); ldap_msgfree(*result);
return 0; return 0;
} }
@ -361,9 +360,8 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = {
talloc_set_destructor(handle, ldapmsg_destructor); talloc_set_destructor(handle, ldapmsg_destructor);
} }
static int ldapmod_destructor(void *p) { static int ldapmod_destructor(LDAPMod ***mod) {
LDAPMod ***result = talloc_get_type_abort(p, LDAPMod **); ldap_mods_free(*mod, True);
ldap_mods_free(*result, True);
return 0; return 0;
} }

4
source/locking/brlock.c
View File

@ -1492,10 +1492,8 @@ int brl_forall(BRLOCK_FN(fn))
Unlock the record. 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; TDB_DATA key;
key.dptr = (char *)&br_lck->key; key.dptr = (char *)&br_lck->key;

4
source/locking/locking.c
View File

@ -672,10 +672,8 @@ static TDB_DATA unparse_share_modes(struct share_mode_lock *lck)
return result; 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 key = locking_key(lck->dev, lck->ino);
TDB_DATA data; TDB_DATA data;

4
source/passdb/passdb.c
View File

@ -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->lm_pw );
data_blob_clear_free( &user->nt_pw ); data_blob_clear_free( &user->nt_pw );

2
source/utils/netlookup.c
View File

@ -41,7 +41,7 @@ static struct con_struct *cs;
Close connection on context destruction. Close connection on context destruction.
********************************************************/ ********************************************************/
static int cs_destructor(void *p) static int cs_destructor(struct con_struct *p)
{ {
if (cs->cli) { if (cs->cli) {
cli_shutdown(cs->cli); cli_shutdown(cs->cli);