From 11ce2cfd70df264c5c91b4daaa9a01c5abc673b0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Jan 2005 04:39:16 +0000 Subject: r4591: - converted the other _p talloc functions to not need _p - added #if TALLOC_DEPRECATED around the _p functions - fixes the code that broke from the above while doing this I fixed quite a number of places that were incorrectly using the non type-safe talloc functions to use the type safe ones. Some were even doing multiplies for array allocation, which is potentially unsafe. (This used to be commit 6e7754abd0c225527fb38363996a6e241b87b37e) --- source4/torture/raw/read.c | 8 ++++---- source4/torture/raw/search.c | 6 +++--- source4/torture/raw/write.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index 12818f7ba6..fb2e2ddec2 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -90,7 +90,7 @@ static BOOL test_read(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) const char *test_data = "TEST DATA"; uint_t seed = time(NULL); - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; @@ -214,7 +214,7 @@ static BOOL test_lockread(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) const char *test_data = "TEST DATA"; uint_t seed = time(NULL); - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; @@ -357,7 +357,7 @@ static BOOL test_readx(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) const char *test_data = "TEST DATA"; uint_t seed = time(NULL); - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; @@ -551,7 +551,7 @@ static BOOL test_readbraw(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) const char *test_data = "TEST DATA"; uint_t seed = time(NULL); - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 55acaba2b2..84466d0cde 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -960,9 +960,9 @@ static BOOL test_many_dirs(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) smbcli_close(cli->tree, fnum); } - file = talloc_zero_array_p(mem_ctx, union smb_search_data, num_dirs); - file2 = talloc_zero_array_p(mem_ctx, union smb_search_data, num_dirs); - file3 = talloc_zero_array_p(mem_ctx, union smb_search_data, num_dirs); + file = talloc_zero_array(mem_ctx, union smb_search_data, num_dirs); + file2 = talloc_zero_array(mem_ctx, union smb_search_data, num_dirs); + file3 = talloc_zero_array(mem_ctx, union smb_search_data, num_dirs); printf("Search first on %d dirs\n", num_dirs); diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c index 06fbe667ea..698520258d 100644 --- a/source4/torture/raw/write.c +++ b/source4/torture/raw/write.c @@ -104,7 +104,7 @@ static BOOL test_write(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) uint_t seed = time(NULL); union smb_fileinfo finfo; - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; @@ -221,7 +221,7 @@ static BOOL test_writex(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) uint_t seed = time(NULL); union smb_fileinfo finfo; - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; @@ -397,7 +397,7 @@ static BOOL test_writeunlock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) uint_t seed = time(NULL); union smb_fileinfo finfo; - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; @@ -534,7 +534,7 @@ static BOOL test_writeclose(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) uint_t seed = time(NULL); union smb_fileinfo finfo; - buf = talloc_zero(mem_ctx, maxsize); + buf = talloc_zero_size(mem_ctx, maxsize); if (!torture_setup_dir(cli, BASEDIR)) { return False; -- cgit