[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-765-g742496d

Stefan Metzmacher metze at samba.org
Fri Mar 27 12:27:16 GMT 2009


The branch, master has been updated
       via  742496d2522ed4a53ce087adc4813331dbc75320 (commit)
       via  5c9e90eb7e7346c2af3bdc15228f97055ed5d1d6 (commit)
      from  ee8bc9659c172a06fc40836c7dea1fb1d9aff244 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 742496d2522ed4a53ce087adc4813331dbc75320
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 27 13:25:26 2009 +0100

    s4:torture/smb2: fix compiler warnings and bugs
    
    metze

commit 5c9e90eb7e7346c2af3bdc15228f97055ed5d1d6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 27 13:21:25 2009 +0100

    s4:torture/smb2: fix the build
    
    We move prototypes of _PUBLIC_ functions into /dev/null,
    as we want public function to have handwritten prototypes.
    
    see proto_header_template in build/make/templates.mk...
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/smb2/durable_open.c |    4 +++-
 source4/torture/smb2/smb2.c         |   10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index f34dfc4..9cc25e3 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -190,7 +190,7 @@ bool test_durable_open_oplock(struct torture_context *tctx,
 			      struct smb2_tree *tree2)
 {
 	TALLOC_CTX *mem_ctx = talloc_new(tctx);
-	struct smb2_create io1, io2, io3;
+	struct smb2_create io1, io2;
 	struct smb2_handle h1;
 	NTSTATUS status;
 	const char *fname = "durable_open_oplock.dat";
@@ -297,4 +297,6 @@ struct torture_suite *torture_smb2_durable_open_init(void)
 	torture_suite_add_2smb2_test(suite, "OPLOCK", test_durable_open_oplock);
 
 	suite->description = talloc_strdup(suite, "SMB2-DURABLE-OPEN tests");
+
+	return suite;
 }
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 3b2e752..3c9522e 100644
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -100,11 +100,11 @@ static bool wrap_simple_2smb2_test(struct torture_context *torture_ctx,
 }
 
 
-_PUBLIC_ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
-							   const char *name,
-							   bool (*run)(struct torture_context *,
-								       struct smb2_tree *,
-								       struct smb2_tree *))
+struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
+						  const char *name,
+						  bool (*run)(struct torture_context *,
+							      struct smb2_tree *,
+							      struct smb2_tree *))
 {
 	struct torture_test *test;
 	struct torture_tcase *tcase;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list