From 787a4d6f45007b8f04b7d14e347a7122676faff6 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Aug 2006 17:17:39 +0000 Subject: r17888: use talloc_*_ptrtype() macros as wrappers arround the talloc_*_size() functions to get rid of c++ warnings metze (This used to be commit 7579503bb886e9c4cc08756013f5311ce550c9fd) --- source4/librpc/ndr/libndr.h | 21 ++++++++++----------- source4/scripting/ejs/ejsrpc.h | 12 ++++-------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 59bfc6ab00..1076936c1d 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -255,29 +255,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 *); diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h index a320392201..bc9a38fcb3 100644 --- a/source4/scripting/ejs/ejsrpc.h +++ b/source4/scripting/ejs/ejsrpc.h @@ -139,20 +139,16 @@ NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs, NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const struct winreg_String *r); -#define EJS_ALLOC_SIZE(ejs, s, size) do { \ - (s) = talloc_size(ejs, size); \ +#define EJS_ALLOC(ejs, s) do { \ + (s) = talloc_ptrtype(ejs, (s)); \ if (!(s)) return ejs_panic(ejs, "out of memory"); \ } while (0) -#define EJS_ALLOC(ejs, s) EJS_ALLOC_SIZE(ejs, s, sizeof(*(s))) - -#define EJS_ALLOC_N_SIZE(ejs, s, n, elsize) do { \ - (s) = talloc_array_size(ejs, elsize, n); \ +#define EJS_ALLOC_N(ejs, s, n) do { \ + (s) = talloc_array_ptrtype(ejs, (s), n); \ if (!(s)) return ejs_panic(ejs, "out of memory"); \ } while (0) -#define EJS_ALLOC_N(ejs, s, n) EJS_ALLOC_N_SIZE(ejs, s, n, sizeof(*(s))) - /* some types are equivalent for ejs */ #define ejs_pull_dom_sid2 ejs_pull_dom_sid #define ejs_push_dom_sid2 ejs_push_dom_sid -- cgit