diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:38:41 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 (patch) | |
| tree | c8351772fdc171b65c12f34b711999a4d24a37af /source3/locking | |
| parent | 3d15137653a7d1b593a9af2eef12f6e5b9a04c4f (diff) | |
| download | samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.tar.gz samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.tar.bz2 samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.zip | |
s3-talloc Change TALLOC_P() to talloc()
Using the standard macro makes it easier to move code into common, as
TALLOC_P isn't standard talloc.
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 2 | ||||
| -rw-r--r-- | source3/locking/locking.c | 6 | ||||
| -rw-r--r-- | source3/locking/posix.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 220688c7e7..9a9fd15789 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1823,7 +1823,7 @@ static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx, files_struct *fsp, bool read_only) { TDB_DATA key, data; - struct byte_range_lock *br_lck = TALLOC_P(mem_ctx, struct byte_range_lock); + struct byte_range_lock *br_lck = talloc(mem_ctx, struct byte_range_lock); bool do_read_only = read_only; if (br_lck == NULL) { diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 55412ec8b2..153f3da585 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -973,7 +973,7 @@ struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx, struct file_id tmp; TDB_DATA key = locking_key(&id, &tmp); - if (!(lck = TALLOC_P(mem_ctx, struct share_mode_lock))) { + if (!(lck = talloc(mem_ctx, struct share_mode_lock))) { DEBUG(0, ("talloc failed\n")); return NULL; } @@ -1004,7 +1004,7 @@ struct share_mode_lock *fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx, TDB_DATA key = locking_key(&id, &tmp); TDB_DATA data; - if (!(lck = TALLOC_P(mem_ctx, struct share_mode_lock))) { + if (!(lck = talloc(mem_ctx, struct share_mode_lock))) { DEBUG(0, ("talloc failed\n")); return NULL; } @@ -1483,7 +1483,7 @@ static struct security_unix_token *copy_unix_token(TALLOC_CTX *ctx, const struct { struct security_unix_token *cpy; - cpy = TALLOC_P(ctx, struct security_unix_token); + cpy = talloc(ctx, struct security_unix_token); if (!cpy) { return NULL; } diff --git a/source3/locking/posix.c b/source3/locking/posix.c index 2e590413f8..51151df9a4 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -892,7 +892,7 @@ BECOMES..... | l_curr| | l_new | +-------+ +---------+ **********************************************/ - struct lock_list *l_new = TALLOC_P(ctx, struct lock_list); + struct lock_list *l_new = talloc(ctx, struct lock_list); if(l_new == NULL) { DEBUG(0,("posix_lock_list: talloc fail.\n")); @@ -1000,7 +1000,7 @@ bool set_posix_lock_windows_flavour(files_struct *fsp, return False; } - if ((ll = TALLOC_P(l_ctx, struct lock_list)) == NULL) { + if ((ll = talloc(l_ctx, struct lock_list)) == NULL) { DEBUG(0,("set_posix_lock_windows_flavour: unable to talloc unlock list.\n")); talloc_destroy(l_ctx); return False; @@ -1119,7 +1119,7 @@ bool release_posix_lock_windows_flavour(files_struct *fsp, return False; } - if ((ul = TALLOC_P(ul_ctx, struct lock_list)) == NULL) { + if ((ul = talloc(ul_ctx, struct lock_list)) == NULL) { DEBUG(0,("release_posix_lock_windows_flavour: unable to talloc unlock list.\n")); talloc_destroy(ul_ctx); return False; @@ -1281,7 +1281,7 @@ bool release_posix_lock_posix_flavour(files_struct *fsp, return False; } - if ((ul = TALLOC_P(ul_ctx, struct lock_list)) == NULL) { + if ((ul = talloc(ul_ctx, struct lock_list)) == NULL) { DEBUG(0,("release_posix_lock_windows_flavour: unable to talloc unlock list.\n")); talloc_destroy(ul_ctx); return False; |