diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-02-13 00:07:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:46 -0500 |
| commit | 2f8478b27d4929d5f7ea8f92f61df57dd869ede6 (patch) | |
| tree | 5141c5f6208229e87766e9865c0faba4daddbe7f /source4/librpc | |
| parent | e90c93402bc916d85653c8f6340655184a6a5789 (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 8 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 52cc665e3a..5e1ffb93e0 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -719,7 +719,7 @@ NTSTATUS ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length) pull a relative object - stage1 called during SCALARS processing */ -NTSTATUS ndr_pull_relative1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset) +NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset) { if (ndr->flags & LIBNDR_FLAG_RELATIVE_CURRENT) { return ndr_token_store(ndr, &ndr->relative_list, p, @@ -733,7 +733,7 @@ NTSTATUS ndr_pull_relative1(struct ndr_pull *ndr, const void *p, uint32_t rel_of pull a relative object - stage2 called during BUFFERS processing */ -NTSTATUS ndr_pull_relative2(struct ndr_pull *ndr, const void *p) +NTSTATUS ndr_pull_relative_ptr2(struct ndr_pull *ndr, const void *p) { uint32_t rel_offset; NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &rel_offset)); @@ -744,7 +744,7 @@ NTSTATUS ndr_pull_relative2(struct ndr_pull *ndr, const void *p) push a relative object - stage1 this is called during SCALARS processing */ -NTSTATUS ndr_push_relative1(struct ndr_push *ndr, const void *p) +NTSTATUS ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p) { if (p == NULL) { NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); @@ -759,7 +759,7 @@ NTSTATUS ndr_push_relative1(struct ndr_push *ndr, const void *p) push a relative object - stage2 this is called during buffers processing */ -NTSTATUS ndr_push_relative2(struct ndr_push *ndr, const void *p) +NTSTATUS ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p) { struct ndr_push_save save; if (p == NULL) { 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) { |