diff options
| author | Simo Sorce <idra@samba.org> | 2005-01-12 16:00:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:47 -0500 |
| commit | a2f77f979d7271a9708ed06f43b00ffb10ec7f4c (patch) | |
| tree | f9de8a02597f95ba9c7af1c2086a69cafacb3a87 /source4/lib/ldb/common/ldb_parse.c | |
| parent | 7588b41e153ebd84c974f7289847bcd05f32ba4b (diff) | |
| download | samba-a2f77f979d7271a9708ed06f43b00ffb10ec7f4c.tar.gz samba-a2f77f979d7271a9708ed06f43b00ffb10ec7f4c.tar.bz2 samba-a2f77f979d7271a9708ed06f43b00ffb10ec7f4c.zip | |
r4714: move the ldb code to the new talloc interface (eg remove _p suffix)
this helps standalone building of ldb
renew the schema module
split code into functions to improve readability and code reuse
add and modify works correctly but we need a proper testsuite
Simo
(This used to be commit a681ae365ff1b5a2771b42ebd90336651ce1e513)
Diffstat (limited to 'source4/lib/ldb/common/ldb_parse.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb_parse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c index 6ee6f99253..d9f7dbe524 100644 --- a/source4/lib/ldb/common/ldb_parse.c +++ b/source4/lib/ldb/common/ldb_parse.c @@ -138,7 +138,7 @@ static struct ldb_parse_tree *ldb_parse_simple(TALLOC_CTX *ctx, const char *s) char *eq, *val, *l; struct ldb_parse_tree *ret; - ret = talloc_p(ctx, struct ldb_parse_tree); + ret = talloc(ctx, struct ldb_parse_tree); if (!ret) { errno = ENOMEM; return NULL; @@ -188,7 +188,7 @@ static struct ldb_parse_tree *ldb_parse_filterlist(TALLOC_CTX *ctx, { struct ldb_parse_tree *ret, *next; - ret = talloc_p(ctx, struct ldb_parse_tree); + ret = talloc(ctx, struct ldb_parse_tree); if (!ret) { errno = ENOMEM; return NULL; @@ -196,7 +196,7 @@ static struct ldb_parse_tree *ldb_parse_filterlist(TALLOC_CTX *ctx, ret->operation = op; ret->u.list.num_elements = 1; - ret->u.list.elements = talloc_p(ret, struct ldb_parse_tree *); + ret->u.list.elements = talloc(ret, struct ldb_parse_tree *); if (!ret->u.list.elements) { errno = ENOMEM; talloc_free(ret); @@ -213,7 +213,7 @@ static struct ldb_parse_tree *ldb_parse_filterlist(TALLOC_CTX *ctx, while (*s && (next = ldb_parse_filter(ret->u.list.elements, &s))) { struct ldb_parse_tree **e; - e = talloc_realloc_p(ret, ret->u.list.elements, + e = talloc_realloc(ret, ret->u.list.elements, struct ldb_parse_tree *, ret->u.list.num_elements+1); if (!e) { @@ -238,7 +238,7 @@ static struct ldb_parse_tree *ldb_parse_not(TALLOC_CTX *ctx, const char *s) { struct ldb_parse_tree *ret; - ret = talloc_p(ctx, struct ldb_parse_tree); + ret = talloc(ctx, struct ldb_parse_tree); if (!ret) { errno = ENOMEM; return NULL; |