[SCM] Samba Shared Repository - branch v3-5-test updated
Jeremy Allison
jra at samba.org
Thu Nov 12 17:06:26 MST 2009
The branch, v3-5-test has been updated
via 439050f... pidl: Fix selftest after s3 code changed (cherry picked from commit e6df4c2bc28b9204cf0637575b0289657e604830)
from 5c81851... Remove unused variable warning. Jeremy. (cherry picked from commit d2a9f4a2729026da11780ae4b71e289982094bd7)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 439050fb40e5ce9c476924b01f2254b9aab35a3e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Nov 9 14:26:55 2009 +0100
pidl: Fix selftest after s3 code changed
(cherry picked from commit e6df4c2bc28b9204cf0637575b0289657e604830)
-----------------------------------------------------------------------
Summary of changes:
pidl/tests/samba3-cli.pl | 86 ++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 59 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl
index be4bf0a..1820a69 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);
}
");
--
Samba Shared Repository
More information about the samba-cvs
mailing list