From 64e88a8ccf2faa34ee9d182f4e89fa6e44c609a6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 17 Jan 2007 14:49:36 +0000
Subject: r20850: Prefix all server calls with dcesrv_ (This used to be commit
 76c78b0339cd88c61a13745f7f4e037f400db21b)

---
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 14 ++++++--------
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm |  4 ++--
 source4/pidl/lib/Parse/Pidl/Samba4/Template.pm   |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'source4/pidl/lib')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 2212044d3b..a1bd3e1f96 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -882,9 +882,7 @@ sub CalcNdrFlags($$$)
 
 sub ParseMemCtxPullStart($$$)
 {
-	my $e = shift;
-	my $l = shift;
-	my $ptr_name = shift;
+	my ($e, $l, $ptr_name) = @_;
 
 	my $mem_r_ctx = "_mem_save_$e->{NAME}_$l->{LEVEL_INDEX}";
 	my $mem_c_ctx = $ptr_name;
@@ -998,7 +996,7 @@ sub ParseElementPullLevel
 			}
 		}
 
-		ParseMemCtxPullStart($e,$l, $var_name);
+		ParseMemCtxPullStart($e, $l, $var_name);
 
 		$var_name = get_value_of($var_name);
 		ParseElementPullLevel($e, GetNextLevel($e,$l), $ndr, $var_name, $env, 1, 1);
@@ -1020,7 +1018,7 @@ sub ParseElementPullLevel
 
 		$var_name = $var_name . "[$counter]";
 
-		ParseMemCtxPullStart($e,$l, $array_name);
+		ParseMemCtxPullStart($e, $l, $array_name);
 
 		if (($primitives and not $l->{IS_DEFERRED}) or ($deferred and $l->{IS_DEFERRED})) {
 			my $nl = GetNextLevel($e,$l);
@@ -1044,10 +1042,10 @@ sub ParseElementPullLevel
 			pidl "}";
 		}
 
-		ParseMemCtxPullEnd($e,$l);
+		ParseMemCtxPullEnd($e, $l);
 
 	} elsif ($l->{TYPE} eq "SWITCH") {
-		ParseElementPullLevel($e,GetNextLevel($e,$l), $ndr, $var_name, $env, $primitives, $deferred);
+		ParseElementPullLevel($e, GetNextLevel($e,$l), $ndr, $var_name, $env, $primitives, $deferred);
 	}
 }
 
@@ -2052,7 +2050,7 @@ sub AllocateArrayLevel($$$$$)
 		pidl "}";
 		if (grep(/in/,@{$e->{DIRECTION}}) and
 		    grep(/out/,@{$e->{DIRECTION}})) {
-			pidl "memcpy(r->out.$e->{NAME},r->in.$e->{NAME},$size * sizeof(*r->in.$e->{NAME}));";
+			pidl "memcpy(r->out.$e->{NAME}, r->in.$e->{NAME}, $size * sizeof(*r->in.$e->{NAME}));";
 		}
 		return;
 	}
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 102b0fc769..bd58342189 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -35,9 +35,9 @@ sub gen_dispatch_switch($)
 		pidl "\t\t\tNDR_PRINT_FUNCTION_DEBUG($fn->{NAME}, NDR_IN, r2);\n";
 		pidl "\t\t}\n";
 		if ($fn->{RETURN_TYPE} && $fn->{RETURN_TYPE} ne "void") {
-			pidl "\t\tr2->out.result = $fn->{NAME}(dce_call, mem_ctx, r2);\n";
+			pidl "\t\tr2->out.result = dcesrv_$fn->{NAME}(dce_call, mem_ctx, r2);\n";
 		} else {
-			pidl "\t\t$fn->{NAME}(dce_call, mem_ctx, r2);\n";
+			pidl "\t\tdcesrv_$fn->{NAME}(dce_call, mem_ctx, r2);\n";
 		}
 		pidl "\t\tif (dce_call->state_flags & DCESRV_CALL_STATE_FLAG_ASYNC) {\n";
 		pidl "\t\t\tDEBUG(5,(\"function $fn->{NAME} will reply async\\n\"));\n";
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Template.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Template.pm
index 111ae28123..f953d0f2fe 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Template.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Template.pm
@@ -58,7 +58,7 @@ sub Template($)
 /* 
   $fname 
 */
-static $d->{RETURN_TYPE} $fname(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static $d->{RETURN_TYPE} dcesrv_$fname(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct $fname *r)
 {
 ";
-- 
cgit