summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/ndr_parser.pm16
-rw-r--r--source4/librpc/ndr/ndr.c30
2 files changed, 2 insertions, 44 deletions
diff --git a/source4/build/pidl/ndr_parser.pm b/source4/build/pidl/ndr_parser.pm
index 3e3fe89e82..d09f43186a 100644
--- a/source4/build/pidl/ndr_parser.pm
+++ b/source4/build/pidl/ndr_parser.pm
@@ -1105,8 +1105,6 @@ sub ParseStructPush($$)
pidl "if (ndr_flags & NDR_SCALARS) {";
indent;
- pidl "NDR_CHECK(ndr_push_struct_start(ndr));";
-
pidl "NDR_CHECK(ndr_push_align(ndr, $struct->{ALIGN}));";
foreach my $e (@{$struct->{ELEMENTS}}) {
@@ -1122,8 +1120,6 @@ sub ParseStructPush($$)
ParseElementPush($e, "ndr", "r->", $env, 0, 1);
}
- pidl "ndr_push_struct_end(ndr);";
-
deindent;
pidl "}";
@@ -1405,8 +1401,6 @@ sub ParseStructPull($$)
pidl "if (ndr_flags & NDR_SCALARS) {";
indent;
- pidl "NDR_CHECK(ndr_pull_struct_start(ndr));";
-
if (defined $conform_e) {
ParseArrayPullPreceding($conform_e, $conform_e->{LEVELS}[0], "r->$conform_e->{NAME}");
}
@@ -1425,8 +1419,6 @@ sub ParseStructPull($$)
ParseElementPull($e, "ndr", "r->", $env, 0, 1);
}
- pidl "ndr_pull_struct_end(ndr);";
-
deindent;
pidl "}";
@@ -1517,8 +1509,6 @@ sub ParseUnionPush($$)
pidl "NDR_CHECK(ndr_push_$e->{SWITCH_TYPE}(ndr, NDR_SCALARS, level));";
}
- pidl "NDR_CHECK(ndr_push_struct_start(ndr));";
-
# my $align = union_alignment($e);
# pidl "NDR_CHECK(ndr_push_align(ndr, $align));";
@@ -1567,7 +1557,7 @@ sub ParseUnionPush($$)
}
deindent;
pidl "}";
- pidl "ndr_push_struct_end(ndr);";
+
deindent;
pidl "}";
end_flags($e);
@@ -1646,8 +1636,6 @@ sub ParseUnionPull($$)
pidl "}";
}
- pidl "NDR_CHECK(ndr_pull_struct_start(ndr));";
-
# my $align = union_alignment($e);
# pidl "\tNDR_CHECK(ndr_pull_align(ndr, $align));\n";
@@ -1697,7 +1685,7 @@ sub ParseUnionPull($$)
}
deindent;
pidl "}";
- pidl "ndr_pull_struct_end(ndr);";
+
deindent;
pidl "}";
end_flags($e);
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 237b64d4eb..4137a997f0 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -407,36 +407,6 @@ NTSTATUS ndr_push_subcontext_header(struct ndr_push *ndr,
}
/*
- mark the start of a structure
-*/
-NTSTATUS ndr_pull_struct_start(struct ndr_pull *ndr)
-{
- return NT_STATUS_OK;
-}
-
-/*
- mark the end of a structure
-*/
-void ndr_pull_struct_end(struct ndr_pull *ndr)
-{
-}
-
-/*
- mark the start of a structure
-*/
-NTSTATUS ndr_push_struct_start(struct ndr_push *ndr)
-{
- return NT_STATUS_OK;
-}
-
-/*
- mark the end of a structure
-*/
-void ndr_push_struct_end(struct ndr_push *ndr)
-{
-}
-
-/*
store a token in the ndr context, for later retrieval
*/
static NTSTATUS ndr_token_store(TALLOC_CTX *mem_ctx,