5 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c
index 0fd1b4fb56..da9478c6d8 100644
--- a/source4/torture/local/binding_string.c
+++ b/source4/torture/local/binding_string.c
@@ -114,7 +114,7 @@ static const char *test_strings[] = {
 	"ncacn_unix_stream:[/tmp/epmapper,sign]",
 };
 
-BOOL torture_local_binding_string(int dummy) 
+BOOL torture_local_binding_string(void) 
 {
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx = talloc_init("test_BindingString");
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 606ac3da5d..2c2a9564bf 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -158,7 +158,7 @@ static int test_buffer(uint8_t *inbuf, size_t size, const char *charset)
 	
 	memset(ptr_out, 0, outsize2);
 	errno = 0;
-	ret2 = iconv(cd, &ptr_in, &size_in2, &ptr_out, &outsize2);
+	ret2 = iconv(cd, discard_const_p(char *, &ptr_in), &size_in2, &ptr_out, &outsize2);
 	errno2 = errno;
 
 	len1 = sizeof(buf1) - outsize1;
@@ -293,7 +293,7 @@ static int test_codepoint(unsigned int codepoint)
 	return 1;
 }
 
-BOOL torture_local_iconv(int dummy) 
+BOOL torture_local_iconv(void) 
 {
 	size_t size;
 	unsigned char inbuf[1000];
@@ -351,7 +351,7 @@ BOOL torture_local_iconv(int dummy)
 
 #else
 
-BOOL torture_local_iconv(int dummy) 
+BOOL torture_local_iconv(void) 
 {
 	printf("No native iconv library - can't run iconv test\n");
 	return True;
diff --git a/source4/torture/local/idtree.c b/source4/torture/local/idtree.c
index 36360b5917..7d0e3e84a8 100644
--- a/source4/torture/local/idtree.c
+++ b/source4/torture/local/idtree.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-BOOL torture_local_idtree(int dummy) 
+BOOL torture_local_idtree(void) 
 {
 	struct idr_context *idr;
 	int i;
diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c
index 18c4d9b03f..c0dab06cca 100644
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@@ -133,7 +133,7 @@ static BOOL test_ping_speed(TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
-BOOL torture_local_messaging(int dummy) 
+BOOL torture_local_messaging(void) 
 {
 	TALLOC_CTX *mem_ctx = talloc_init("torture_local_messaging");
 	BOOL ret = True;
diff --git a/source4/torture/local/talloc.c b/source4/torture/local/talloc.c
index eca7e55483..332312200a 100644
--- a/source4/torture/local/talloc.c
+++ b/source4/torture/local/talloc.c
@@ -679,7 +679,7 @@ static BOOL test_speed(void)
 }
 
 
-BOOL torture_local_talloc(int dummy) 
+BOOL torture_local_talloc(void) 
 {
 	BOOL ret = True;