diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-06 03:20:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:26 -0500 |
| commit | e159e42d8472f36f51e400e351fc43f2a7dc44f5 (patch) | |
| tree | 641b7a3f25e77a4b8b1c2724287cd243119c411a /source4/librpc/ndr | |
| parent | ddc10d4d37984246a6547e34a32d629c689c40d1 (diff) | |
| download | samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.tar.gz samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.tar.bz2 samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.zip | |
r4550: talloc() is now typesafe. It is exactly equivalent to the old talloc_p() macro. Use
talloc_size() if you want the old behaviour.
I have kept talloc_p() as an alias for now. Once we change all calls
to be plain talloc() then we can remove it.
(This used to be commit 2011bbeb841fd6bfccf3d44a49f79203f7f55baa)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index bb28c3a23c..aebd9892ba 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -229,7 +229,7 @@ enum ndr_err_code { #define NDR_ALLOC_SIZE(ndr, s, size) do { \ - (s) = talloc(ndr, size); \ + (s) = talloc_size(ndr, size); \ if ((size) && !(s)) return ndr_pull_error(ndr, NDR_ERR_ALLOC, \ "Alloc %u failed\n", \ size); \ @@ -247,7 +247,7 @@ enum ndr_err_code { #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \ - (s) = talloc(ndr, size); \ + (s) = talloc_size(ndr, size); \ if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed\n", size); \ } while (0) |