svn commit: samba r7184 - in branches/SAMBA_4_0/source: build/pidl librpc/ndr

metze at samba.org metze at samba.org
Thu Jun 2 00:57:14 GMT 2005


Author: metze
Date: 2005-06-02 00:57:13 +0000 (Thu, 02 Jun 2005)
New Revision: 7184

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7184

Log:
remove unused ndr_pull/push_struct_start/end() functions

metze
Modified:
   branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
   branches/SAMBA_4_0/source/librpc/ndr/ndr.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm	2005-06-02 00:20:54 UTC (rev 7183)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm	2005-06-02 00:57:13 UTC (rev 7184)
@@ -1105,8 +1105,6 @@
 	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 @@
 		ParseElementPush($e, "ndr", "r->", $env, 0, 1);
 	}
 
-	pidl "ndr_push_struct_end(ndr);";
-
 	deindent;
 	pidl "}";
 
@@ -1405,8 +1401,6 @@
 	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 @@
 		ParseElementPull($e, "ndr", "r->", $env, 0, 1);
 	}
 
-	pidl "ndr_pull_struct_end(ndr);";
-
 	deindent;
 	pidl "}";
 
@@ -1517,8 +1509,6 @@
 		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 @@
 	}
 	deindent;
 	pidl "}";
-	pidl "ndr_push_struct_end(ndr);";
+
 	deindent;
 	pidl "}";
 	end_flags($e);
@@ -1646,8 +1636,6 @@
 		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 @@
 	}
 	deindent;
 	pidl "}";
-	pidl "ndr_pull_struct_end(ndr);";
+
 	deindent;
 	pidl "}";
 	end_flags($e);

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2005-06-02 00:20:54 UTC (rev 7183)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2005-06-02 00:57:13 UTC (rev 7184)
@@ -407,36 +407,6 @@
 }
 
 /*
-  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, 



More information about the samba-cvs mailing list