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/torture | |
| 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/torture')
| -rw-r--r-- | source3/torture/nbench.c | 2 | ||||
| -rw-r--r-- | source3/torture/vfstest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/torture/nbench.c b/source3/torture/nbench.c index efae14c76c..d2fddf0094 100644 --- a/source3/torture/nbench.c +++ b/source3/torture/nbench.c @@ -96,7 +96,7 @@ static struct nbench_cmd_struct *nbench_parse(TALLOC_CTX *mem_ctx, char *cmd; char *status; - result = TALLOC_P(mem_ctx, struct nbench_cmd_struct); + result = talloc(mem_ctx, struct nbench_cmd_struct); if (result == NULL) { return NULL; } diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index 74ef572577..572fec1f42 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -470,7 +470,7 @@ int main(int argc, char *argv[]) /* some basic initialization stuff */ sec_init(); vfs.conn = TALLOC_ZERO_P(NULL, connection_struct); - vfs.conn->params = TALLOC_P(vfs.conn, struct share_params); + vfs.conn->params = talloc(vfs.conn, struct share_params); for (i=0; i < 1024; i++) vfs.files[i] = NULL; |