diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-06 02:32:43 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:20 -0500 |
commit | cc55aef7c116d03ba2817625b0ba9edb378525e3 (patch) | |
tree | e36f5694a422c5b80cb1f631c9dd182994aab9e2 /source4/torture | |
parent | 66bd6142a2fc4679e1d6cc98237a23927dda5f63 (diff) | |
download | samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.gz samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.bz2 samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.zip |
r4547: - added talloc_new(ctx) macro that is a neater form of the common talloc(ctx, 0) call.
- cleaned up some talloc usage in various files
I'd like to get to the point that we have no calls to talloc(), at
which point we will rename talloc_p() to talloc(), to encourage
everyone to use the typesafe functions.
(This used to be commit e6c81d7c9f8a6938947d3c1c8a971a0d6d50b67a)
Diffstat (limited to 'source4/torture')
-rw-r--r-- | source4/torture/basic/denytest.c | 4 | ||||
-rw-r--r-- | source4/torture/local/idtree.c | 2 | ||||
-rw-r--r-- | source4/torture/raw/search.c | 4 | ||||
-rw-r--r-- | source4/torture/torture_util.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 0e0032058f..7308805da7 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1812,7 +1812,7 @@ static BOOL torture_ntdenytest(struct smbcli_state *cli1, struct smbcli_state *c for (i=0;i<torture_numops;i++) { NTSTATUS status1, status2, status2_p; int64_t tdif; - TALLOC_CTX *mem_ctx = talloc(NULL, 0); + TALLOC_CTX *mem_ctx = talloc_new(NULL); enum deny_result res, res2; int b_sa1 = random() & ((1<<nbits1)-1); int b_am1 = random() & ((1<<nbits2)-1); @@ -1977,7 +1977,7 @@ BOOL torture_denydos_sharing(void) return False; } - mem_ctx = talloc(cli, 0); + mem_ctx = talloc_new(cli); printf("Checking DENY_DOS shared handle semantics\n"); smbcli_unlink(cli->tree, fname); diff --git a/source4/torture/local/idtree.c b/source4/torture/local/idtree.c index 7d0e3e84a8..3f30d7123f 100644 --- a/source4/torture/local/idtree.c +++ b/source4/torture/local/idtree.c @@ -31,7 +31,7 @@ BOOL torture_local_idtree(void) BOOL ret = True; extern int torture_numops; int n = torture_numops; - void *ctx = talloc(NULL, 0); + void *ctx = talloc_new(NULL); idr = idr_init(ctx); diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 5064c1a061..55acaba2b2 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -635,7 +635,7 @@ static BOOL test_many_files(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) for (t=0;t<ARRAY_SIZE(search_types);t++) { ZERO_STRUCT(result); - result.mem_ctx = talloc(mem_ctx, 0); + result.mem_ctx = talloc_new(mem_ctx); printf("Continue %s via %s\n", search_types[t].name, search_types[t].cont_name); @@ -767,7 +767,7 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) printf("pulling the first file\n"); ZERO_STRUCT(result); - result.mem_ctx = talloc(mem_ctx, 0); + result.mem_ctx = talloc_new(mem_ctx); io.generic.level = RAW_SEARCH_BOTH_DIRECTORY_INFO; io.t2ffirst.in.search_attrib = 0; diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c index de93d6731f..3df1f3be41 100644 --- a/source4/torture/torture_util.c +++ b/source4/torture/torture_util.c @@ -363,7 +363,7 @@ NTSTATUS torture_check_ea(struct smbcli_state *cli, union smb_fileinfo info; NTSTATUS status; struct ea_name ea; - TALLOC_CTX *mem_ctx = talloc(cli, 0); + TALLOC_CTX *mem_ctx = talloc_new(cli); info.ea_list.level = RAW_FILEINFO_EA_LIST; info.ea_list.file.fname = fname; |