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/rpc/atsvc.c       |  2 +-
 source4/torture/rpc/autoidl.c     |  2 +-
 source4/torture/rpc/bind.c        |  2 +-
 source4/torture/rpc/countcalls.c  |  2 +-
 source4/torture/rpc/dcom.c        |  2 +-
 source4/torture/rpc/dfs.c         |  6 +++---
 source4/torture/rpc/drsuapi.c     |  2 +-
 source4/torture/rpc/echo.c        |  5 +++--
 source4/torture/rpc/epmapper.c    |  2 +-
 source4/torture/rpc/eventlog.c    |  2 +-
 source4/torture/rpc/lsa.c         |  2 +-
 source4/torture/rpc/mgmt.c        |  2 +-
 source4/torture/rpc/netlogon.c    |  2 +-
 source4/torture/rpc/oxidresolve.c |  2 +-
 source4/torture/rpc/samr.c        |  2 +-
 source4/torture/rpc/scanner.c     |  2 +-
 source4/torture/rpc/schannel.c    |  2 +-
 source4/torture/rpc/spoolss.c     | 26 ++++++++++++++++----------
 source4/torture/rpc/srvsvc.c      |  2 +-
 source4/torture/rpc/svcctl.c      |  2 +-
 source4/torture/rpc/winreg.c      |  2 +-
 source4/torture/rpc/wkssvc.c      |  2 +-
 22 files changed, 41 insertions(+), 34 deletions(-)

(limited to 'source4/torture/rpc')

diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 6b1e558902..52ac53e58b 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -132,7 +132,7 @@ static BOOL test_JobAdd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_rpc_atsvc(int dummy)
+BOOL torture_rpc_atsvc(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 8ec4a19787..b8e18affb5 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -254,7 +254,7 @@ static void test_auto_scan(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_ta
 	test_scan_call(mem_ctx, iface, 2);
 }
 
-BOOL torture_rpc_autoidl(int dummy)
+BOOL torture_rpc_autoidl(void)
 {
 	TALLOC_CTX *mem_ctx;
 	const struct dcerpc_interface_table *iface;
diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c
index 6602a9bcfd..a4f3030bf6 100644
--- a/source4/torture/rpc/bind.c
+++ b/source4/torture/rpc/bind.c
@@ -33,7 +33,7 @@
 
 */
 
-BOOL torture_multi_bind(int dummy) 
+BOOL torture_multi_bind(void) 
 {
 	struct dcerpc_pipe *p;
 	const char *domain = lp_parm_string(-1, "torture", "userdomain");
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index 99dc4d3e42..c914622061 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 
 
-BOOL torture_rpc_countcalls(int dummy)
+BOOL torture_rpc_countcalls(void)
 {
 	const struct dcerpc_interface_table *iface;
 	NTSTATUS status;
diff --git a/source4/torture/rpc/dcom.c b/source4/torture/rpc/dcom.c
index 8ff47a363d..13f24c9d00 100644
--- a/source4/torture/rpc/dcom.c
+++ b/source4/torture/rpc/dcom.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 
-BOOL torture_rpc_dcom(int dummy)
+BOOL torture_rpc_dcom(void)
 {
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index e19a4f0da3..ed7e3ec3a9 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -130,7 +130,7 @@ static BOOL test_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
-
+#if 0
 static BOOL test_Add(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
@@ -161,9 +161,9 @@ static BOOL test_Add(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	return True;
 }
+#endif
 
-
-BOOL torture_rpc_dfs(int dummy)
+BOOL torture_rpc_dfs(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index be1582e57f..9981b24258 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -421,7 +421,7 @@ static BOOL test_DsUnbind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	return ret;
 }
 
-BOOL torture_rpc_drsuapi(int dummy)
+BOOL torture_rpc_drsuapi(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 7d12c1b7f3..342255f102 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -207,7 +207,7 @@ static BOOL test_testcall2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
-
+#if 0
 /*
   test the TestSleep interface
 */
@@ -259,8 +259,9 @@ static BOOL test_sleep(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	return ret;
 }
+#endif
 
-BOOL torture_rpc_echo(int dummy)
+BOOL torture_rpc_echo(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index d55355cb31..b1076e64c6 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -248,7 +248,7 @@ static BOOL test_Lookup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_rpc_epmapper(int dummy)
+BOOL torture_rpc_epmapper(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 343c81e385..dfa9fc7a51 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -144,7 +144,7 @@ static BOOL test_OpenEventLog(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct
 	return True;
 }
 
-BOOL torture_rpc_eventlog(int dummy)
+BOOL torture_rpc_eventlog(void)
 {
     NTSTATUS status;
     struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 022c5a85b1..ed82c731bb 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -868,7 +868,7 @@ static BOOL test_Close(struct dcerpc_pipe *p,
 	return True;
 }
 
-BOOL torture_rpc_lsa(int dummy)
+BOOL torture_rpc_lsa(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index cd04d0be4f..4340bde691 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -172,7 +172,7 @@ static BOOL test_stop_server_listening(struct dcerpc_pipe *p,
 }
 
 
-BOOL torture_rpc_mgmt(int dummy)
+BOOL torture_rpc_mgmt(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 881d413b5c..7ddd8da0a7 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -1728,7 +1728,7 @@ static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
-BOOL torture_rpc_netlogon(int dummy)
+BOOL torture_rpc_netlogon(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 476d140842..4acaaeecc0 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -82,7 +82,7 @@ static int test_ServerAlive2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return 1;
 }
 
-BOOL torture_rpc_oxidresolve(int dummy)
+BOOL torture_rpc_oxidresolve(void)
 {
         NTSTATUS status;
        struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 9c63e654a3..544d147a17 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -3153,7 +3153,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_rpc_samr(int dummy)
+BOOL torture_rpc_samr(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 4bc8b88ba5..f93ea0419a 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -127,7 +127,7 @@ static BOOL test_inq_if_ids(struct dcerpc_pipe *p,
 }
 
 
-BOOL torture_rpc_scanner(int dummy)
+BOOL torture_rpc_scanner(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index f6c94b145a..c41fe19506 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -108,7 +108,7 @@ failed:
 /*
   a schannel test suite
  */
-BOOL torture_rpc_schannel(int dummy)
+BOOL torture_rpc_schannel(void)
 {
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index db0f1bc1a9..939c13a937 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -88,7 +88,8 @@ static BOOL test_ClosePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_GetForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-		  struct policy_handle *handle, char *formname)
+			 struct policy_handle *handle, 
+			 const char *formname)
 {
 	NTSTATUS status;
 	struct spoolss_GetForm r;
@@ -190,7 +191,8 @@ static BOOL test_EnumForms(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_DeleteForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-		     struct policy_handle *handle, char *formname)
+			    struct policy_handle *handle, 
+			    const char *formname)
 {
 	NTSTATUS status;
 	struct spoolss_DeleteForm r;
@@ -466,7 +468,8 @@ static BOOL test_EnumJobs(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_GetPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			 struct policy_handle *handle, char *value_name)
+				struct policy_handle *handle, 
+				const char *value_name)
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinterData r;
@@ -501,8 +504,9 @@ static BOOL test_GetPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_GetPrinterDataEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			   struct policy_handle *handle, char *key_name,
-			   char *value_name)
+				  struct policy_handle *handle, 
+				  const char *key_name,
+				  const char *value_name)
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinterDataEx r;
@@ -586,7 +590,8 @@ static BOOL test_EnumPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_DeletePrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			    struct policy_handle *handle, char *value_name)
+				   struct policy_handle *handle, 
+				   const char *value_name)
 {
 	NTSTATUS status;
 	struct spoolss_DeletePrinterData r;
@@ -611,8 +616,8 @@ static BOOL test_SetPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_SetPrinterData r;
-	char *value_name = "spottyfoot";
-
+	const char *value_name = "spottyfoot";
+	
 	r.in.handle = handle;
 	r.in.value_name = value_name;
 	r.in.type = 0;
@@ -888,7 +893,8 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 static BOOL test_GetPrinterDriver2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-				   struct policy_handle *handle, char *driver_name)
+				   struct policy_handle *handle, 
+				   const char *driver_name)
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinterDriver2 r;
@@ -1018,7 +1024,7 @@ static BOOL test_EnumPrinterDrivers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
-BOOL torture_rpc_spoolss(int dummy)
+BOOL torture_rpc_spoolss(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 8fa4f049b4..53cf2a7b61 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -679,7 +679,7 @@ static BOOL test_NetRemoteTOD(struct dcerpc_pipe *p,
 	return ret;
 }
 
-BOOL torture_rpc_srvsvc(int dummy)
+BOOL torture_rpc_srvsvc(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index 6fd80f5fa7..148ed38e5f 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -105,7 +105,7 @@ static BOOL test_CloseServiceHandle(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	return True;
 }
 
-BOOL torture_rpc_svcctl(int dummy)
+BOOL torture_rpc_svcctl(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 40adb758a7..139da7f574 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -544,7 +544,7 @@ static BOOL test_Open(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, void *fn)
 	return ret;
 }
 
-BOOL torture_rpc_winreg(int dummy)
+BOOL torture_rpc_winreg(void)
 {
         NTSTATUS status;
        struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 4768163d5c..d8552d5fa2 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -83,7 +83,7 @@ static BOOL test_NetWkstaTransportEnum(struct dcerpc_pipe *p,
 
 
 
-BOOL torture_rpc_wkssvc(int dummy)
+BOOL torture_rpc_wkssvc(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
-- 
cgit