summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-07 04:47:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:30 -0500
commit35a2ced64a3c853289d7fa921e91724ce2998b79 (patch)
treed296b94d14b4b4102b1d6aca181f5253576c707b
parent8b1512fc9bf73ade637c9f04974d8c01797d7bdc (diff)
downloadsamba-35a2ced64a3c853289d7fa921e91724ce2998b79.tar.gz
samba-35a2ced64a3c853289d7fa921e91724ce2998b79.tar.bz2
samba-35a2ced64a3c853289d7fa921e91724ce2998b79.zip
r4593: don't use the _p function in the testsuite, as when built standalone it doesn't
use TALLOC_DEPRECATED (This used to be commit 2fe0e2528f14627832942f6404a4b1be4b556c97)
-rw-r--r--source4/lib/talloc/testsuite.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 005474a2cc..d93894b520 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -432,13 +432,13 @@ static BOOL test_misc(void)
CHECK_BLOCKS(p1, 3);
talloc_free(p2);
- d = talloc_array_p(p1, double, 0x20000000);
+ d = talloc_array(p1, double, 0x20000000);
if (d) {
printf("failed: integer overflow not detected\n");
return False;
}
- d = talloc_realloc_p(p1, d, double, 0x20000000);
+ d = talloc_realloc(p1, d, double, 0x20000000);
if (d) {
printf("failed: integer overflow not detected\n");
return False;
@@ -583,14 +583,14 @@ static BOOL test_realloc_child(void)
root = talloc_new(NULL);
- el1 = talloc_p(root, struct el1);
- el1->list = talloc_p(el1, struct el2 *);
- el1->list[0] = talloc_p(el1->list, struct el2);
+ el1 = talloc(root, struct el1);
+ el1->list = talloc(el1, struct el2 *);
+ el1->list[0] = talloc(el1->list, struct el2);
el1->list[0]->name = talloc_strdup(el1->list[0], "testing");
- el2 = talloc_p(el1->list, struct el2);
+ el2 = talloc(el1->list, struct el2);
- el1->list = talloc_realloc_p(el1, el1->list, struct el2 *, 2);
+ el1->list = talloc_realloc(el1, el1->list, struct el2 *, 2);
el1->list[1] = el2;
talloc_free(root);
@@ -609,10 +609,10 @@ static BOOL test_steal(void)
root = talloc_new(NULL);
- p1 = talloc_array_p(root, char, 10);
+ p1 = talloc_array(root, char, 10);
CHECK_SIZE(p1, 10);
- p2 = talloc_realloc_p(root, NULL, char, 20);
+ p2 = talloc_realloc(root, NULL, char, 20);
CHECK_SIZE(p1, 10);
CHECK_SIZE(root, 30);