diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-08-21 07:43:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:14 -0500 |
| commit | b7e1ea20dc873a753ff64653987130f03897a4e9 (patch) | |
| tree | 67f37a1a19113c622dedf942f39b27ca994c1b05 /source4/librpc/ndr/libndr.h | |
| parent | b45f4ebbb880e41abf86abb54264123f3edbde05 (diff) | |
| download | samba-b7e1ea20dc873a753ff64653987130f03897a4e9.tar.gz samba-b7e1ea20dc873a753ff64653987130f03897a4e9.tar.bz2 samba-b7e1ea20dc873a753ff64653987130f03897a4e9.zip | |
r1985: take advantage of the new talloc in a few more places
(This used to be commit 6ffdfd779936ce8c5ca49c5f444e8da2bbeee0a8)
Diffstat (limited to 'source4/librpc/ndr/libndr.h')
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 68713cdae2..cea7290577 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -45,7 +45,6 @@ struct ndr_pull { char *data; uint32_t data_size; uint32_t offset; - TALLOC_CTX *mem_ctx; struct ndr_token_list *relative_list; @@ -66,7 +65,6 @@ struct ndr_push { char *data; uint32_t alloc_size; uint32_t offset; - TALLOC_CTX *mem_ctx; struct ndr_token_list *relative_list; @@ -83,7 +81,6 @@ struct ndr_push_save { /* structure passed to functions that print IDL structures */ struct ndr_print { uint32_t flags; /* LIBNDR_FLAG_* */ - TALLOC_CTX *mem_ctx; uint32_t depth; void (*print)(struct ndr_print *, const char *, ...); void *private; @@ -191,7 +188,7 @@ enum ndr_err_code { #define NDR_ALLOC_SIZE(ndr, s, size) do { \ - (s) = talloc(ndr->mem_ctx, size); \ + (s) = talloc(ndr, size); \ if ((size) && !(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, \ "Alloc %u failed\n", \ size); \ @@ -204,7 +201,7 @@ enum ndr_err_code { if ((n) == 0) { \ (s) = NULL; \ } else { \ - (s) = talloc(ndr->mem_ctx, (n) * elsize); \ + (s) = talloc(ndr, (n) * elsize); \ if (!(s)) return ndr_pull_error(ndr, \ NDR_ERR_ALLOC, \ "Alloc %u * %u failed\n", \ @@ -216,7 +213,7 @@ enum ndr_err_code { #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \ - (s) = talloc(ndr->mem_ctx, size); \ + (s) = talloc(ndr, size); \ if ((size) && !(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, \ "push alloc %u failed\n",\ size); \ |