summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr/ndr_basic.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-02-13 00:07:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:46 -0500
commit2f8478b27d4929d5f7ea8f92f61df57dd869ede6 (patch)
tree5141c5f6208229e87766e9865c0faba4daddbe7f /source4/librpc/ndr/ndr_basic.c
parente90c93402bc916d85653c8f6340655184a6a5789 (diff)
downloadsamba-2f8478b27d4929d5f7ea8f92f61df57dd869ede6.tar.gz
samba-2f8478b27d4929d5f7ea8f92f61df57dd869ede6.tar.bz2
samba-2f8478b27d4929d5f7ea8f92f61df57dd869ede6.zip
r5363: - ndr_%_ptr -> ndr_%_unique_ptr
- ndr_%_relative% -> ndr_%_relative_ptr% - Change pointer_default() default to "unique" (DCE uses "ptr" as default, MIDL doesn't follow the standard and uses "unique") (This used to be commit 53b4ecbcc7a8da67cde1377de6f24a3de6d229e3)
Diffstat (limited to 'source4/librpc/ndr/ndr_basic.c')
-rw-r--r--source4/librpc/ndr/ndr_basic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index 281980fb4c..8f43d6c18a 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -108,7 +108,7 @@ NTSTATUS ndr_pull_int32(struct ndr_pull *ndr, int ndr_flags, int32_t *v)
/*
parse a pointer referent identifier
*/
-NTSTATUS ndr_pull_ptr(struct ndr_pull *ndr, uint32_t *v)
+NTSTATUS ndr_pull_unique_ptr(struct ndr_pull *ndr, uint32_t *v)
{
NTSTATUS status;
status = ndr_pull_uint32(ndr, NDR_SCALARS, v);
@@ -482,7 +482,7 @@ void ndr_push_restore(struct ndr_push *ndr, struct ndr_push_save *save)
/*
push a 1 if a pointer is non-NULL, otherwise 0
*/
-NTSTATUS ndr_push_ptr(struct ndr_push *ndr, const void *p)
+NTSTATUS ndr_push_unique_ptr(struct ndr_push *ndr, const void *p)
{
uint32_t ptr = 0;
if (p) {