summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-02-20 17:59:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:14 -0500
commitfb5362c069b5b6548478b2217a0519c56d856705 (patch)
tree11c9ed652475e840dd24e8fc46c7942a322acf4b /source3/locking
parent2cf38b62c5d0169385dd9ddc76d9619c14cbbf13 (diff)
downloadsamba-fb5362c069b5b6548478b2217a0519c56d856705.tar.gz
samba-fb5362c069b5b6548478b2217a0519c56d856705.tar.bz2
samba-fb5362c069b5b6548478b2217a0519c56d856705.zip
r13571: Replace all calls to talloc_free() with thye TALLOC_FREE()
macro which sets the freed pointer to NULL. (This used to be commit b65be8874a2efe5a4b167448960a4fcf6bd995e2)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/locking.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index d157c30c82..076f8a4969 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -681,7 +681,7 @@ struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx,
if (tdb_chainlock(tdb, key) != 0) {
DEBUG(3, ("Could not lock share entry\n"));
- talloc_free(lck);
+ TALLOC_FREE(lck);
return NULL;
}
@@ -697,20 +697,20 @@ struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx,
if (lck->fresh) {
if (fname == NULL || servicepath == NULL) {
- talloc_free(lck);
+ TALLOC_FREE(lck);
return NULL;
}
lck->filename = talloc_strdup(lck, fname);
lck->servicepath = talloc_strdup(lck, servicepath);
if (lck->filename == NULL || lck->servicepath == NULL) {
DEBUG(0, ("talloc failed\n"));
- talloc_free(lck);
+ TALLOC_FREE(lck);
return NULL;
}
} else {
if (!parse_share_modes(data, lck)) {
DEBUG(0, ("Could not parse share modes\n"));
- talloc_free(lck);
+ TALLOC_FREE(lck);
SAFE_FREE(data.dptr);
return NULL;
}
@@ -814,7 +814,7 @@ BOOL get_delete_on_close_flag(SMB_DEV_T dev, SMB_INO_T inode)
return False;
}
result = lck->delete_on_close;
- talloc_free(lck);
+ TALLOC_FREE(lck);
return result;
}
@@ -1142,7 +1142,7 @@ void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok
{
/* Ensure there's no token. */
if (lck->delete_token) {
- talloc_free(lck->delete_token); /* Also deletes groups... */
+ TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
lck->delete_token = NULL;
}
@@ -1195,7 +1195,7 @@ BOOL set_delete_on_close(files_struct *fsp, BOOL delete_on_close, UNIX_USER_TOKE
lck->modified = True;
}
- talloc_free(lck);
+ TALLOC_FREE(lck);
return True;
}