summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-20 11:08:33 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:49 +0100
commite399a606f512df15316bc5e804384ffa475ca446 (patch)
treeeacbc1b226e14d52a79b823848613c34bf1f7703
parent981437efbc966c4bb0880fc0b02715d297ae6644 (diff)
downloadsamba-e399a606f512df15316bc5e804384ffa475ca446.tar.gz
samba-e399a606f512df15316bc5e804384ffa475ca446.tar.bz2
samba-e399a606f512df15316bc5e804384ffa475ca446.zip
r26054: ndr: remove ndr_push/pull_save
Using a uint32_t offset is all we need metze (This used to be commit 2c06b48a858016f9329dcd73231fb3c7b711a918)
-rw-r--r--source4/librpc/ndr/libndr.h12
-rw-r--r--source4/librpc/ndr/ndr.c15
-rw-r--r--source4/librpc/ndr/ndr_basic.c16
3 files changed, 0 insertions, 43 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 2ef66882cf..2ac0b86f57 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -67,12 +67,6 @@ struct ndr_pull {
uint32_t ptr_count;
};
-struct ndr_pull_save {
- uint32_t data_size;
- uint32_t offset;
- struct ndr_pull_save *next;
-};
-
/* structure passed to functions that generate NDR formatted data */
struct ndr_push {
uint32_t flags; /* LIBNDR_FLAG_* */
@@ -92,12 +86,6 @@ struct ndr_push {
uint32_t ptr_count;
};
-struct ndr_push_save {
- uint32_t offset;
- struct ndr_push_save *next;
-};
-
-
/* structure passed to functions that print IDL structures */
struct ndr_print {
uint32_t flags; /* LIBNDR_FLAG_* */
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index c51e77cde5..40afeacebf 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -98,21 +98,6 @@ static enum ndr_err_code ndr_pull_set_offset(struct ndr_pull *ndr, uint32_t ofs)
return NDR_ERR_SUCCESS;
}
-/* save the offset/size of the current ndr state */
-_PUBLIC_ void ndr_pull_save(struct ndr_pull *ndr, struct ndr_pull_save *save)
-{
- save->offset = ndr->offset;
- save->data_size = ndr->data_size;
-}
-
-/* restore the size/offset of a ndr structure */
-_PUBLIC_ void ndr_pull_restore(struct ndr_pull *ndr, struct ndr_pull_save *save)
-{
- ndr->offset = save->offset;
- ndr->data_size = save->data_size;
-}
-
-
/* create a ndr_push structure, ready for some marshalling */
_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx)
{
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index 0ef78a2a54..93a177f94e 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -447,22 +447,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_fl
}
/*
- save the current position
- */
-_PUBLIC_ void ndr_push_save(struct ndr_push *ndr, struct ndr_push_save *save)
-{
- save->offset = ndr->offset;
-}
-
-/*
- restore the position
- */
-_PUBLIC_ void ndr_push_restore(struct ndr_push *ndr, struct ndr_push_save *save)
-{
- ndr->offset = save->offset;
-}
-
-/*
push a unique non-zero value if a pointer is non-NULL, otherwise 0
*/
_PUBLIC_ enum ndr_err_code ndr_push_unique_ptr(struct ndr_push *ndr, const void *p)