From e6df4c2bc28b9204cf0637575b0289657e604830 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 9 Nov 2009 14:26:55 +0100
Subject: pidl: Fix selftest after s3 code changed

---
 pidl/tests/samba3-cli.pl | 86 +++++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 59 deletions(-)

(limited to 'pidl/tests')

diff --git a/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl
index be4bf0a65c..1820a69bb3 100755
--- a/pidl/tests/samba3-cli.pl
+++ b/pidl/tests/samba3-cli.pl
@@ -59,10 +59,6 @@ struct tevent_req *rpccli_bar_send(TALLOC_CTX *mem_ctx,
 
 	/* Out parameters */
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(bar, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -104,10 +100,6 @@ static void rpccli_bar_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(bar, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -133,14 +125,10 @@ NTSTATUS rpccli_bar_recv(struct tevent_req *req,
 NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 		    TALLOC_CTX *mem_ctx)
 {
-\tstruct bar r;
-\tNTSTATUS status;
-
-\t/* In parameters */
+	struct bar r;
+	NTSTATUS status;
 
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t}
+	/* In parameters */
 
 	status = cli->dispatch(cli,
 				mem_ctx,
@@ -148,22 +136,18 @@ NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 				NDR_BAR,
 				&r);
 
-\tif (!NT_STATUS_IS_OK(status)) {
-\t\treturn status;
-\t}
-
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t}
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 
-\tif (NT_STATUS_IS_ERR(status)) {
-\t\treturn status;
-\t}
+	if (NT_STATUS_IS_ERR(status)) {
+		return status;
+	}
 
-\t/* Return variables */
+	/* Return variables */
 
-\t/* Return result */
-\treturn NT_STATUS_OK;
+	/* Return result */
+	return NT_STATUS_OK;
 }
 
 ");
@@ -205,10 +189,6 @@ struct tevent_req *rpccli_bar_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(bar, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -253,10 +233,6 @@ static void rpccli_bar_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(bar, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -287,14 +263,10 @@ NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 		    TALLOC_CTX *mem_ctx,
 		    WERROR *werror)
 {
-\tstruct bar r;
-\tNTSTATUS status;
-
-\t/* In parameters */
+	struct bar r;
+	NTSTATUS status;
 
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t}
+	/* In parameters */
 
 	status = cli->dispatch(cli,
 				mem_ctx,
@@ -302,26 +274,22 @@ NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 				NDR_BAR,
 				&r);
 
-\tif (!NT_STATUS_IS_OK(status)) {
-\t\treturn status;
-\t}
-
-\tif (DEBUGLEVEL >= 10) {
-\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t}
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 
-\tif (NT_STATUS_IS_ERR(status)) {
-\t\treturn status;
-\t}
+	if (NT_STATUS_IS_ERR(status)) {
+		return status;
+	}
 
-\t/* Return variables */
+	/* Return variables */
 
-\t/* Return result */
-\tif (werror) {
-\t\t*werror = r.out.result;
-\t}
+	/* Return result */
+	if (werror) {
+		*werror = r.out.result;
+	}
 
-\treturn werror_to_ntstatus(r.out.result);
+	return werror_to_ntstatus(r.out.result);
 }
 
 ");
-- 
cgit