From 16952dc7a420d2e3b4994229171580f1608d020d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 19 Mar 2014 10:36:04 +0100
Subject: [PATCH] pidl:Samba3/ServerNDR: make CallWithStruct() more flexible

We now pass multiple callbacks $check, $cleanup, $return
down to AllocOutVar().

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 34 +++++++++++++++++--------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 7670941d1d6..1bb0e3382bb 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -48,9 +48,9 @@ sub DeclLevel($$)
 	return $res;
 }
 
-sub AllocOutVar($$$$$)
+sub AllocOutVar($$$$$$$)
 {
-	my ($e, $mem_ctx, $name, $env, $fail) = @_;
+	my ($e, $mem_ctx, $name, $env, $check, $cleanup, $return) = @_;
 
 	my $l = $e->{LEVELS}[0];
 
@@ -83,15 +83,18 @@ sub AllocOutVar($$$$$)
 		pidl "$name = talloc_zero($mem_ctx, " . DeclLevel($e, 1) . ");";
 	}
 
-	pidl "if ($name == NULL) {";
-	$fail->();
+	pidl "if (" . $check->($name) . ") {";
+	indent;
+	pidl $cleanup->($name) if defined($cleanup);
+	pidl $return->($name) if defined($return);
+	deindent;
 	pidl "}";
 	pidl "";
 }
 
-sub CallWithStruct($$$$)
+sub CallWithStruct($$$$$$)
 {
-	my ($pipes_struct, $mem_ctx, $fn, $fail) = @_;
+	my ($pipes_struct, $mem_ctx, $fn, $check, $cleanup, $return) = @_;
 	my $env = GenerateFunctionOutEnv($fn);
 	my $hasout = 0;
 	foreach (@{$fn->{ELEMENTS}}) {
@@ -114,7 +117,8 @@ sub CallWithStruct($$$$)
 			# noop
 		} elsif (grep(/out/, @dir) and not
 				 has_property($_, "represent_as")) {
-			AllocOutVar($_, $mem_ctx, "r->out.$_->{NAME}", $env, $fail);
+			AllocOutVar($_, $mem_ctx, "r->out.$_->{NAME}", $env,
+				    $check, $cleanup, $return);
 		}
 	}
 
@@ -175,10 +179,18 @@ sub ParseFunction($$)
 	pidl "}";
 	pidl "";
 
-	CallWithStruct("p", "r", $fn, 
-	sub { 
-			pidl "\ttalloc_free(r);";
-			pidl "\treturn false;";
+	CallWithStruct("p", "r", $fn,
+		sub ($) {
+			my ($name) = @_;
+			return "${name} == NULL";
+		},
+		sub ($) {
+			my ($name) = @_;
+			return "talloc_free(r);";
+		},
+		sub ($) {
+			my ($name) = @_;
+			return "return false;";
 		}
 	);
 
-- 
2.34.1