Rev 11215: Add _params to function parameters structs. in file:///home/jelmer/bzr.samba/4.0-structrename/

[Jelmer Vernooij]

------------------------------------------------------------
revno: 11215
revision-id: jelmer at samba.org-20070117121845-9ear02g6fnmju2gg
parent: svn-v2:20836 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-structrename
timestamp: Wed 2007-01-17 13:18:45 +0100
message:
  Add _params to function parameters structs.
modified:
  source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fHeader.pm
  source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fNDR%2fClient.pm
  source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fNDR%2fParser.pm
=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/Header.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2006-11-16 22:13:44 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2007-01-17 12:18:45 +0000
@@ -273,7 +273,7 @@
 
     $headerstructs{$fn->{NAME}} = 1;
 
-    pidl "\nstruct $fn->{NAME} {\n";
+    pidl "\nstruct $fn->{NAME}_params {\n";
     $tab_depth++;
     my $needed = 0;
 

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm	2006-04-02 16:26:02 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm	2007-01-17 12:18:45 +0000
@@ -23,12 +23,12 @@
 	my $name = $fn->{NAME};
 	my $uname = uc $name;
 
-	$res_hdr .= "\nstruct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
-NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
+	$res_hdr .= "\nstruct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name\_params *r);
+NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name\_params *r);
 ";
 
 	$res .= "
-struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r)
+struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name\_params *r)
 {
 	if (p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
 		NDR_PRINT_IN_DEBUG($name, r);
@@ -37,7 +37,7 @@
 	return dcerpc_ndr_request_send(p, NULL, &dcerpc_table_$interface->{NAME}, DCERPC_$uname, mem_ctx, r);
 }
 
-NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r)
+NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name\_params *r)
 {
 	struct rpc_request *req;
 	NTSTATUS status;

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-01-10 00:37:30 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-01-17 12:18:45 +0000
@@ -1921,11 +1921,11 @@
 {
 	my($fn) = shift;
 
-	pidl_hdr "void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, const struct $fn->{NAME} *r);";
+	pidl_hdr "void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, const struct $fn->{NAME}_params *r);";
 
 	return if has_property($fn, "noprint");
 
-	pidl "_PUBLIC_ void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, const struct $fn->{NAME} *r)";
+	pidl "_PUBLIC_ void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, const struct $fn->{NAME}_params *r)";
 	pidl "{";
 	indent;
 
@@ -1987,7 +1987,7 @@
 { 
 	my($fn) = shift;
 
-	fn_declare("push", $fn, "NTSTATUS ndr_push_$fn->{NAME}(struct ndr_push *ndr, int flags, const struct $fn->{NAME} *r)") or return;
+	fn_declare("push", $fn, "NTSTATUS ndr_push_$fn->{NAME}(struct ndr_push *ndr, int flags, const struct $fn->{NAME}_params *r)") or return;
 
 	return if has_property($fn, "nopush");
 
@@ -2067,7 +2067,7 @@
 	my($fn) = shift;
 
 	# pull function args
-	fn_declare("pull", $fn, "NTSTATUS ndr_pull_$fn->{NAME}(struct ndr_pull *ndr, int flags, struct $fn->{NAME} *r)") or return;
+	fn_declare("pull", $fn, "NTSTATUS ndr_pull_$fn->{NAME}(struct ndr_pull *ndr, int flags, struct $fn->{NAME}_params *r)") or return;
 
 	pidl "{";
 	indent;
@@ -2183,7 +2183,7 @@
 		next if not defined($d->{OPNUM});
 		pidl "\t{";
 		pidl "\t\t\"$d->{NAME}\",";
-		pidl "\t\tsizeof(struct $d->{NAME}),";
+		pidl "\t\tsizeof(struct $d->{NAME}_params),";
 		pidl "\t\t(ndr_push_flags_fn_t) ndr_push_$d->{NAME},";
 		pidl "\t\t(ndr_pull_flags_fn_t) ndr_pull_$d->{NAME},";
 		pidl "\t\t(ndr_print_function_t) ndr_print_$d->{NAME},";