[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-329-gad9089c
Jelmer Vernooij
jelmer at samba.org
Thu Jan 10 19:40:06 GMT 2008
The branch, v4-0-test has been updated
via ad9089c413bfac6dddda5e837d7143fe7a2c29fb (commit)
via bd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d (commit)
from dec016822ce9439b40f3d9403d42ebc76ba2e0e1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit ad9089c413bfac6dddda5e837d7143fe7a2c29fb
Merge: bd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d dec016822ce9439b40f3d9403d42ebc76ba2e0e1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jan 10 20:39:02 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
commit bd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jan 10 20:38:14 2008 +0100
pidl: Fix samba3-cli test after Günthers formatting fixes.
-----------------------------------------------------------------------
Summary of changes:
source/pidl/tests/samba3-cli.pl | 69 +++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pidl/tests/samba3-cli.pl b/source/pidl/tests/samba3-cli.pl
index 5086300..1b2a3c9 100755
--- a/source/pidl/tests/samba3-cli.pl
+++ b/source/pidl/tests/samba3-cli.pl
@@ -29,31 +29,40 @@ my $x = new Parse::Pidl::Samba3::ClientNDR();
$fn = { NAME => "bar", ELEMENTS => [ ] };
$x->ParseFunction("foo", $fn);
-is($x->{res}, "NTSTATUS rpccli_bar(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx)
+is($x->{res},
+"NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx)
{
\tstruct bar r;
\tNTSTATUS status;
-\t
+
\t/* In parameters */
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
\t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t
-\tstatus = cli_do_rpc_ndr(cli, mem_ctx, PI_FOO, &ndr_table_foo, NDR_BAR, &r);
-\t
+\t}
+
+ status = cli_do_rpc_ndr(cli,
+ mem_ctx,
+ PI_FOO,
+ &ndr_table_foo,
+ NDR_BAR,
+ &r);
+
\tif (!NT_STATUS_IS_OK(status)) {
\t\treturn status;
\t}
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t
+\t}
+
\tif (NT_STATUS_IS_ERR(status)) {
\t\treturn status;
\t}
-\t
+
\t/* Return variables */
-\t
+
\t/* Return result */
\treturn NT_STATUS_OK;
}
@@ -64,36 +73,46 @@ $x = new Parse::Pidl::Samba3::ClientNDR();
$fn = { NAME => "bar", ELEMENTS => [ ], RETURN_TYPE => "WERROR" };
$x->ParseFunction("foo", $fn);
-is($x->{res}, "NTSTATUS rpccli_bar(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror)
+is($x->{res},
+"NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
\tstruct bar r;
\tNTSTATUS status;
-\t
+
\t/* In parameters */
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
\t\tNDR_PRINT_IN_DEBUG(bar, &r);
-\t
-\tstatus = cli_do_rpc_ndr(cli, mem_ctx, PI_FOO, &ndr_table_foo, NDR_BAR, &r);
-\t
+\t}
+
+ status = cli_do_rpc_ndr(cli,
+ mem_ctx,
+ PI_FOO,
+ &ndr_table_foo,
+ NDR_BAR,
+ &r);
+
\tif (!NT_STATUS_IS_OK(status)) {
\t\treturn status;
\t}
-\t
-\tif (DEBUGLEVEL >= 10)
+
+\tif (DEBUGLEVEL >= 10) {
\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
-\t
+\t}
+
\tif (NT_STATUS_IS_ERR(status)) {
\t\treturn status;
\t}
-\t
+
\t/* Return variables */
-\t
+
\t/* Return result */
\tif (werror) {
\t\t*werror = r.out.result;
\t}
-\t
+
\treturn werror_to_ntstatus(r.out.result);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list