diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-16 18:26:02 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2007-01-16 18:26:02 +0000 |
| commit | 363718bb752602317dfda7b9648b044c3238249b (patch) | |
| tree | bbed258ba75770159763c7ba27abe738f56c6a7b | |
| parent | c8498f926f8d0671e7573dde6ae38ae7c7fd0037 (diff) | |
| download | samba-363718bb752602317dfda7b9648b044c3238249b.tar.gz samba-363718bb752602317dfda7b9648b044c3238249b.tar.xz samba-363718bb752602317dfda7b9648b044c3238249b.zip | |
r20839: Fix other C++ warnings
| -rw-r--r-- | source/librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | source/rpcclient/cmd_echo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/librpc/ndr/libndr.h b/source/librpc/ndr/libndr.h index 6032185d212..32dd0ef6c59 100644 --- a/source/librpc/ndr/libndr.h +++ b/source/librpc/ndr/libndr.h @@ -274,7 +274,7 @@ enum ndr_compression_alg { #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \ - (s) = talloc_size(ndr, size); \ + (s) = talloc_array(ndr, uint8, size); \ if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed: %s\n", (unsigned)size, __location__); \ } while (0) diff --git a/source/rpcclient/cmd_echo.c b/source/rpcclient/cmd_echo.c index 0a06a5c1664..81028dfb739 100644 --- a/source/rpcclient/cmd_echo.c +++ b/source/rpcclient/cmd_echo.c @@ -101,7 +101,7 @@ static NTSTATUS cmd_echo_source_data(struct rpc_pipe_client *cli, size = atoi(argv[1]); - out_data = SMB_MALLOC(size); + out_data = SMB_MALLOC_ARRAY(uint8, size); result = rpccli_echo_SourceData(cli, mem_ctx, size, out_data); if (!NT_STATUS_IS_OK(result)) |