From ba6d5fcb97b9831dddf7dfe09fb02fbb23d864b4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 28 Oct 2004 13:40:50 +0000
Subject: r3324: made the smbtorture code completely warning free (This used to
 be commit 7067bb9b52223cafa28470f264f0b60646a07a01)

---
 source4/torture/basic/aliases.c     |  2 +-
 source4/torture/basic/attr.c        |  2 +-
 source4/torture/basic/charset.c     |  2 +-
 source4/torture/basic/delete.c      |  2 +-
 source4/torture/basic/denytest.c    |  6 +++---
 source4/torture/basic/dfstest.c     |  4 ++--
 source4/torture/basic/dir.c         |  4 ++--
 source4/torture/basic/locking.c     | 14 +++++++-------
 source4/torture/basic/mangle_test.c |  4 ++--
 source4/torture/basic/rename.c      |  2 +-
 source4/torture/basic/scanner.c     |  6 +++---
 source4/torture/basic/secleak.c     |  2 +-
 source4/torture/basic/utable.c      |  4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'source4/torture/basic')

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 1cc5b3f39b..4f63b366a5 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -379,7 +379,7 @@ static void setpathinfo_aliases(struct smbcli_state *cli)
 
 
 /* look for aliased info levels in trans2 calls */
-BOOL torture_trans2_aliases(int dummy)
+BOOL torture_trans2_aliases(void)
 {
 	struct smbcli_state *cli;
 
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index df93efaeaf..b70b1c2617 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -84,7 +84,7 @@ static const struct trunc_open_results attr_results[] = {
 };
 
 
-BOOL torture_openattrtest(int dummy)
+BOOL torture_openattrtest(void)
 {
 	struct smbcli_state *cli1;
 	const char *fname = "\\openattr.file";
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index d36c9f5b91..090303ac30 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -225,7 +225,7 @@ static BOOL test_widea(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_charset(int dummy)
+BOOL torture_charset(void)
 {
 	static struct smbcli_state *cli;
 	BOOL ret = True;
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 225a73736e..742a51bcaa 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -26,7 +26,7 @@
 /*
   Test delete on close semantics.
  */
-BOOL torture_test_delete(int dummy)
+BOOL torture_test_delete(void)
 {
 	struct smbcli_state *cli1;
 	struct smbcli_state *cli2 = NULL;
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index b8ee5890e5..6dd38e8e79 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -1406,7 +1406,7 @@ static void progress_bar(uint_t i, uint_t total)
 /*
   this produces a matrix of deny mode behaviour for 1 connection
  */
-BOOL torture_denytest1(int dummy)
+BOOL torture_denytest1(void)
 {
 	static struct smbcli_state *cli1;
 	int fnum1, fnum2;
@@ -1505,7 +1505,7 @@ failed:
 /*
   this produces a matrix of deny mode behaviour with 2 connections
  */
-BOOL torture_denytest2(int dummy)
+BOOL torture_denytest2(void)
 {
 	static struct smbcli_state *cli1, *cli2;
 	int fnum1, fnum2;
@@ -1606,7 +1606,7 @@ failed:
 /*
    simple test harness for playing with deny modes
  */
-BOOL torture_denytest3(int dummy)
+BOOL torture_denytest3(void)
 {
 	struct smbcli_state *cli1, *cli2;
 	int fnum1, fnum2;
diff --git a/source4/torture/basic/dfstest.c b/source4/torture/basic/dfstest.c
index eb2d517f6d..078aa00512 100644
--- a/source4/torture/basic/dfstest.c
+++ b/source4/torture/basic/dfstest.c
@@ -29,7 +29,7 @@ static const char *sockops="TCP_NODELAY";
 /*
  checks for correct DFS cluster support
  */
-BOOL torture_dfs_basic(int dummy)
+BOOL torture_dfs_basic(void)
 {
 	int current_server = 0;
 	char *fname[DFS_FILE_COUNT];
@@ -357,7 +357,7 @@ void dfs_list_fn(file_info *finfo, const char *name, void* parmsp)
 #define DFS_RANDOM_FILE_COUNT 10
 #define DFS_RANDOM_DIR_COUNT 3
 #define DFS_RANDOM_DIR_LEVELS 2  
-BOOL torture_dfs_random(int dummy)
+BOOL torture_dfs_random(void)
 {
 	char *fname[DFS_RANDOM_FILE_COUNT];
 	int file_server[DFS_RANDOM_FILE_COUNT];
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index de2944e7fe..d34e064580 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -30,7 +30,7 @@ static void list_fn(file_info *finfo, const char *name, void *state)
 /*
   test directory listing speed
  */
-BOOL torture_dirtest1(int dummy)
+BOOL torture_dirtest1(void)
 {
 	int i;
 	struct smbcli_state *cli;
@@ -86,7 +86,7 @@ BOOL torture_dirtest1(int dummy)
 	return correct;
 }
 
-BOOL torture_dirtest2(int dummy)
+BOOL torture_dirtest2(void)
 {
 	int i;
 	struct smbcli_state *cli;
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 387daa3101..9683557ca8 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -30,7 +30,7 @@
      must not use posix semantics)
   2) support for lock timeouts
  */
-BOOL torture_locktest1(int dummy)
+BOOL torture_locktest1(void)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = "\\lockt1.lck";
@@ -184,7 +184,7 @@ BOOL torture_locktest1(int dummy)
 
   3) the server denies unlock requests by an incorrect client PID
 */
-BOOL torture_locktest2(int dummy)
+BOOL torture_locktest2(void)
 {
 	struct smbcli_state *cli;
 	const char *fname = "\\lockt2.lck";
@@ -322,7 +322,7 @@ BOOL torture_locktest2(int dummy)
 
   1) the server supports the full offset range in lock requests
 */
-BOOL torture_locktest3(int dummy)
+BOOL torture_locktest3(void)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = "\\lockt3.lck";
@@ -454,7 +454,7 @@ BOOL torture_locktest3(int dummy)
 /*
   looks at overlapping locks
 */
-BOOL torture_locktest4(int dummy)
+BOOL torture_locktest4(void)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = "\\lockt4.lck";
@@ -622,7 +622,7 @@ BOOL torture_locktest4(int dummy)
 /*
   looks at lock upgrade/downgrade.
 */
-BOOL torture_locktest5(int dummy)
+BOOL torture_locktest5(void)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = "\\lockt5.lck";
@@ -743,7 +743,7 @@ ret = NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 0, 4)) &&
 /*
   tries the unusual lockingX locktype bits
 */
-BOOL torture_locktest6(int dummy)
+BOOL torture_locktest6(void)
 {
 	struct smbcli_state *cli;
 	const char *fname[1] = { "\\lock6.txt" };
@@ -781,7 +781,7 @@ BOOL torture_locktest6(int dummy)
 	return True;
 }
 
-BOOL torture_locktest7(int dummy)
+BOOL torture_locktest7(void)
 {
 	struct smbcli_state *cli1;
 	const char *fname = "\\lockt7.lck";
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index c0c77f950f..8c4f5514a6 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -96,7 +96,7 @@ static BOOL test_one(struct smbcli_state *cli, const char *name)
 	} else {
 		TDB_DATA namedata;
 		/* store it for later */
-		namedata.dptr = name;
+		namedata.dptr = discard_const_p(char, name);
 		namedata.dsize = strlen(name)+1;
 		tdb_store_bystring(tdb, shortname, namedata, TDB_REPLACE);
 	}
@@ -148,7 +148,7 @@ static void gen_name(char *name)
 }
 
 
-BOOL torture_mangle(int dummy)
+BOOL torture_mangle(void)
 {
 	extern int torture_numops;
 	static struct smbcli_state *cli;
diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index f9caea0665..e26c85b5df 100644
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -25,7 +25,7 @@
 /*
   Test rename on files open with share delete and no share delete.
  */
-BOOL torture_test_rename(int dummy)
+BOOL torture_test_rename(void)
 {
 	struct smbcli_state *cli1;
 	const char *fname = "\\test.txt";
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index f4ebd5dacd..cd53cb3979 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -236,7 +236,7 @@ static BOOL scan_trans2(struct smbcli_state *cli, int op, int level,
 }
 
 
-BOOL torture_trans2_scan(int dummy)
+BOOL torture_trans2_scan(void)
 {
 	static struct smbcli_state *cli;
 	int op, level;
@@ -475,7 +475,7 @@ static BOOL scan_nttrans(struct smbcli_state *cli, int op, int level,
 }
 
 
-BOOL torture_nttrans_scan(int dummy)
+BOOL torture_nttrans_scan(void)
 {
 	static struct smbcli_state *cli;
 	int op, level;
@@ -515,7 +515,7 @@ BOOL torture_nttrans_scan(int dummy)
 
 
 /* scan for valid base SMB requests */
-BOOL torture_smb_scan(int dummy)
+BOOL torture_smb_scan(void)
 {
 	static struct smbcli_state *cli;
 	int op;
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 998faec54e..c3c8dcbb13 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -46,7 +46,7 @@ static BOOL try_failed_login(struct smbcli_state *cli)
 	return True;
 }
 
-BOOL torture_sec_leak(int dummy)
+BOOL torture_sec_leak(void)
 {
 	struct smbcli_state *cli;
 	time_t t1 = time(NULL);
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index 8047e5a468..900f0be830 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 
-BOOL torture_utable(int dummy)
+BOOL torture_utable(void)
 {
 	struct smbcli_state *cli;
 	fstring fname;
@@ -114,7 +114,7 @@ static char *form_name(int c)
 	return fname;
 }
 
-BOOL torture_casetable(int dummy)
+BOOL torture_casetable(void)
 {
 	static struct smbcli_state *cli;
 	char *fname;
-- 
cgit