diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-05 19:26:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:10:57 -0500 |
| commit | 75b3cfc17def4a5b49c7fbc4cfae1c85d12a3a11 (patch) | |
| tree | 46a38490ea10b24dc3a459a1022fd519e6469fd2 | |
| parent | 363f99d0b8a3297fe33c71011bf8e3bc94436931 (diff) | |
| download | samba-75b3cfc17def4a5b49c7fbc4cfae1c85d12a3a11.tar.gz samba-75b3cfc17def4a5b49c7fbc4cfae1c85d12a3a11.tar.bz2 samba-75b3cfc17def4a5b49c7fbc4cfae1c85d12a3a11.zip | |
r5663: Revert some changes I didn't mean to commit...
(This used to be commit 54e0be6f1eccbd870eb0e60ae8cdb90d2dc7f657)
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 26 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_spoolss_buf.c | 6 |
3 files changed, 2 insertions, 32 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index e2ac4279f1..4880df43bd 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -49,7 +49,6 @@ struct ndr_pull { struct ndr_token_list *relative_list; struct ndr_token_list *array_size_list; struct ndr_token_list *array_length_list; - struct ndr_token_list *switch_list; /* this is used to ensure we generate unique reference IDs between request and reply */ @@ -69,7 +68,6 @@ struct ndr_push { uint32_t alloc_size; uint32_t offset; - struct ndr_token_list *switch_list; struct ndr_token_list *relative_list; /* this is used to ensure we generate unique reference IDs */ diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 2e350aa0da..549230bb29 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -642,32 +642,6 @@ NTSTATUS ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length) } /* - store a switch value - */ -NTSTATUS ndr_push_set_switch_value(struct ndr_push *ndr, void *p, uint32_t val) -{ - return ndr_token_store(ndr, &ndr->switch_list, p, val); -} - -NTSTATUS ndr_pull_set_switch_value(struct ndr_pull *ndr, void *p, uint32_t val) -{ - return ndr_token_store(ndr, &ndr->switch_list, p, val); -} - -/* - retrieve a switch value - */ -uint32_t ndr_push_get_switch_value(struct ndr_push *ndr, void *p) -{ - return ndr_token_peek(&ndr->switch_list, p); -} - -uint32_t ndr_pull_get_switch_value(struct ndr_pull *ndr, void *p) -{ - return ndr_token_peek(&ndr->switch_list, p); -} - -/* pull a relative object - stage1 called during SCALARS processing */ diff --git a/source4/librpc/ndr/ndr_spoolss_buf.c b/source4/librpc/ndr/ndr_spoolss_buf.c index 4b1483709a..e13e912b68 100644 --- a/source4/librpc/ndr/ndr_spoolss_buf.c +++ b/source4/librpc/ndr/ndr_spoolss_buf.c @@ -39,8 +39,7 @@ for (i=0;i<r->out.count;i++) {\ ndr2->data += ndr2->offset;\ ndr2->offset = 0;\ - NDR_CHECK(ndr_push_set_switch_value(ndr2, &(*r->out.info)[i], r->in.level)); \ - NDR_CHECK(ndr_push_##type(ndr2, NDR_SCALARS|NDR_BUFFERS, &(*r->out.info)[i]));\ + NDR_CHECK(ndr_push_##type(ndr2, NDR_SCALARS|NDR_BUFFERS, r->in.level, &(*r->out.info)[i]));\ }\ if (*r->in.buf_size >= ndr2->offset) {\ buffer = data_blob_const(ndr2->data, ndr2->offset);\ @@ -95,8 +94,7 @@ for (i=0;i<r->out.count;i++) {\ ndr2->data += ndr2->offset;\ ndr2->offset = 0;\ - NDR_CHECK(ndr_pull_set_switch_value(ndr2, &(*r->out.info)[i], r->in.level)); \ - NDR_CHECK(ndr_pull_##type(ndr2, NDR_SCALARS|NDR_BUFFERS, &(*r->out.info)[i]));\ + NDR_CHECK(ndr_pull_##type(ndr2, NDR_SCALARS|NDR_BUFFERS, r->in.level, &(*r->out.info)[i]));\ }\ }\ } while(0) |