From 759da3b915e2006d4c87b5ace47f399accd9ce91 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 27 Jan 2005 07:08:20 +0000
Subject: r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies
 for the large commit. I thought this was worthwhile to get done for
 consistency. (This used to be commit
 ec32b22ed5ec224f6324f5e069d15e92e38e15c0)

---
 source4/torture/basic/aliases.c    | 14 +++++++-------
 source4/torture/basic/delaywrite.c |  2 +-
 source4/torture/basic/disconnect.c |  2 +-
 source4/torture/basic/scanner.c    |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source4/torture/basic')

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 018bfd9f1a..edea3d963e 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -48,7 +48,7 @@ static void gen_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int lev
 		status = smb_raw_trans2(cli->tree, mem_ctx, t2);
 		if (!NT_STATUS_IS_OK(status)) continue;
 
-		t2b = talloc_p(mem_ctx, struct trans2_blobs);
+		t2b = talloc(mem_ctx, struct trans2_blobs);
 		t2b->level = level;
 		t2b->params = t2->out.params;
 		t2b->data = t2->out.data;
@@ -75,7 +75,7 @@ static void gen_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int lev
 
 	d_printf("Found %d aliased levels\n", alias_count);
 	
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 /* look for qfsinfo aliases */
@@ -176,7 +176,7 @@ static void qpathinfo_aliases(struct smbcli_state *cli)
 	gen_aliases(cli, &t2, 0);
 
 	smbcli_unlink(cli->tree, fname);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 
@@ -224,7 +224,7 @@ static void findfirst_aliases(struct smbcli_state *cli)
 	gen_aliases(cli, &t2, 6);
 
 	smbcli_unlink(cli->tree, fname);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 
@@ -278,7 +278,7 @@ static void gen_set_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int
 		if (!NT_STATUS_IS_OK(status) &&
 		    !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) continue;
 
-		t2b = talloc_p(mem_ctx, struct trans2_blobs);
+		t2b = talloc(mem_ctx, struct trans2_blobs);
 		t2b->level = level;
 		t2b->params = t2->out.params;
 		t2b->data = t2->out.data;
@@ -290,7 +290,7 @@ static void gen_set_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int
 	}
 
 	d_printf("Found %d valid levels\n", count);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 
@@ -375,7 +375,7 @@ static void setpathinfo_aliases(struct smbcli_state *cli)
 	if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) {
 		printf("unlink: %s\n", smbcli_errstr(cli->tree));
 	}
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index 51fe2814e2..27a7c92eed 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -467,6 +467,6 @@ BOOL torture_delay_write(void)
 	ret &= test_delayed_write_update2(cli, mem_ctx);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index 898fc41b4e..2a302ae3f6 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -156,6 +156,6 @@ BOOL torture_disconnect(void)
 	smb_raw_exit(cli->session);
 	smbcli_deltree(cli->tree, BASEDIR);
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 4a92b5f31a..b1bbdf1cd1 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -77,7 +77,7 @@ static NTSTATUS try_trans2(struct smbcli_state *cli,
 	*rparam_len = t2.out.params.length;
 	*rdata_len = t2.out.data.length;
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	
 	return status;
 }
@@ -355,13 +355,13 @@ static NTSTATUS try_nttrans(struct smbcli_state *cli,
 	
 	if (NT_STATUS_IS_ERR(status)) {
 		DEBUG(1,("Failed to send NT_TRANS\n"));
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return status;
 	}
 	*rparam_len = parms.out.params.length;
 	*rdata_len = parms.out.data.length;
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 
 	return status;
 }
-- 
cgit