diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
| commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
| tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/lib/registry/common/reg_util.c | |
| parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
| download | samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2 samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip | |
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)
Diffstat (limited to 'source4/lib/registry/common/reg_util.c')
| -rw-r--r-- | source4/lib/registry/common/reg_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c index ef46dd6174..b11b24151e 100644 --- a/source4/lib/registry/common/reg_util.c +++ b/source4/lib/registry/common/reg_util.c @@ -99,7 +99,7 @@ char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value *val) BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, struct registry_value **value) { int i; - *value = talloc_p(mem_ctx, struct registry_value); + *value = talloc(mem_ctx, struct registry_value); (*value)->data_type = -1; /* Find the correct type */ @@ -123,7 +123,7 @@ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *da break; case REG_DWORD: (*value)->data_len = sizeof(uint32); - (*value)->data_blk = talloc_p(mem_ctx, uint32); + (*value)->data_blk = talloc(mem_ctx, uint32); *((uint32 *)(*value)->data_blk) = strtol(data_str, NULL, 0); break; @@ -264,7 +264,7 @@ WERROR reg_key_del_abs(struct registry_context *ctx, const char *path) error = reg_key_del(parent, n); } - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return error; } |