From 75b3cfc17def4a5b49c7fbc4cfae1c85d12a3a11 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 5 Mar 2005 19:26:45 +0000
Subject: r5663: Revert some changes I didn't mean to commit... (This used to
 be commit 54e0be6f1eccbd870eb0e60ae8cdb90d2dc7f657)

---
 source4/librpc/ndr/libndr.h          |  2 --
 source4/librpc/ndr/ndr.c             | 26 --------------------------
 source4/librpc/ndr/ndr_spoolss_buf.c |  6 ++----
 3 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'source4')

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
@@ -641,32 +641,6 @@ NTSTATUS ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length)
 	return NT_STATUS_OK;
 }
 
-/*
-  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)
-- 
cgit