diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-18 20:41:45 +0000 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2006-09-18 20:41:45 +0000 |
commit | 14d0c15bcf97b69f8ae6e800c0539502e583034f (patch) | |
tree | d8ac8fd63dff71f3ae87832ee4f18c738494a06d /source/librpc | |
parent | dc7e73d893036a9598a6097a9cada7ffe41aefdb (diff) | |
download | samba-14d0c15bcf97b69f8ae6e800c0539502e583034f.tar.gz samba-14d0c15bcf97b69f8ae6e800c0539502e583034f.tar.xz samba-14d0c15bcf97b69f8ae6e800c0539502e583034f.zip |
r18632: Make C++ compilers happy.
Diffstat (limited to 'source/librpc')
-rw-r--r-- | source/librpc/ndr/libndr.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/source/librpc/ndr/libndr.h b/source/librpc/ndr/libndr.h index 7ea0acbdb59..6032185d212 100644 --- a/source/librpc/ndr/libndr.h +++ b/source/librpc/ndr/libndr.h @@ -247,7 +247,7 @@ enum ndr_compression_alg { if (!(mem_ctx)) {\ return ndr_pull_error(ndr, NDR_ERR_ALLOC, "NDR_PULL_SET_MEM_CTX(NULL): %s\n", __location__); \ }\ - ndr->current_mem_ctx = mem_ctx;\ + ndr->current_mem_ctx = CONST_DISCARD(TALLOC_CTX *, mem_ctx);\ }\ } while(0) @@ -260,29 +260,28 @@ enum ndr_compression_alg { }\ } while(0) -#define NDR_PULL_ALLOC_SIZE(ndr, s, size) do { \ +#define NDR_PULL_ALLOC(ndr, s) do { \ _NDR_PULL_FIX_CURRENT_MEM_CTX(ndr);\ - (s) = talloc_size(ndr->current_mem_ctx, size); \ - if (!(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Alloc %u failed: %s\n",(unsigned)size, __location__); \ + (s) = talloc_ptrtype(ndr->current_mem_ctx, (s)); \ + if (!(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Alloc %s failed: %s\n", # s, __location__); \ } while (0) -#define NDR_PULL_ALLOC(ndr, s) NDR_PULL_ALLOC_SIZE(ndr, s, sizeof(*(s))) - -#define NDR_PULL_ALLOC_N_SIZE(ndr, s, n, elsize) do { \ +#define NDR_PULL_ALLOC_N(ndr, s, n) do { \ _NDR_PULL_FIX_CURRENT_MEM_CTX(ndr);\ - (s) = talloc_array_size(ndr->current_mem_ctx, elsize, n); \ - if (!(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Alloc %u * %u failed: %s\n", (unsigned)n, (unsigned)elsize, __location__); \ + (s) = talloc_array_ptrtype(ndr->current_mem_ctx, (s), n); \ + if (!(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Alloc %u * %s failed: %s\n", (unsigned)n, # s, __location__); \ } while (0) -#define NDR_PULL_ALLOC_N(ndr, s, n) NDR_PULL_ALLOC_N_SIZE(ndr, s, n, sizeof(*(s))) - #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \ (s) = talloc_size(ndr, size); \ if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed: %s\n", (unsigned)size, __location__); \ } while (0) -#define NDR_PUSH_ALLOC(ndr, s) NDR_PUSH_ALLOC_SIZE(ndr, s, sizeof(*(s))) +#define NDR_PUSH_ALLOC(ndr, s) do { \ + (s) = talloc_ptrtype(ndr, (s)); \ + if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %s failed: %s\n", # s, __location__); \ +} while (0) /* these are used when generic fn pointers are needed for ndr push/pull fns */ typedef NTSTATUS (*ndr_push_flags_fn_t)(struct ndr_push *, int ndr_flags, const void *); |