From e835621799647ee70630b389fb53d15b15d68355 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 17 Jul 2005 09:20:52 +0000
Subject: r8520: fixed a pile of warnings from the build farm gcc -Wall output
 on S390. This is an attempt to avoid the panic we're seeing in the automatic
 builds.

The main fixes are:

 - assumptions that sizeof(size_t) == sizeof(int), mostly in printf formats

 - use of NULL format statements to perform dn searches.

 - assumption that sizeof() returns an int
(This used to be commit a58ea6b3854973b694d2b1e22323ed7eb00e3a3f)
---
 source4/torture/local/iconv.c  | 12 ++++++------
 source4/torture/local/idtree.c |  2 +-
 source4/torture/local/socket.c |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source4/torture/local')

diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 9aa678995b..662816d533 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -174,7 +174,7 @@ static int test_buffer(uint8_t *inbuf, size_t size, const char *charset)
 	}
 
 	if (ret1 != ret2) {
-		printf("ret1=%d ret2=%d\n", ret1, ret2);
+		printf("ret1=%d ret2=%d\n", (int)ret1, (int)ret2);
 		ok = 0;
 	}
 
@@ -187,20 +187,20 @@ static int test_buffer(uint8_t *inbuf, size_t size, const char *charset)
 	
 	if (outsize1 != outsize2) {
 		printf("\noutsize mismatch outsize1=%d outsize2=%d\n",
-		       outsize1, outsize2);
+		       (int)outsize1, (int)outsize2);
 		ok = 0;
 	}
 	
 	if (size_in1 != size_in2) {
 		printf("\nsize_in mismatch size_in1=%d size_in2=%d\n",
-		       size_in1, size_in2);
+		       (int)size_in1, (int)size_in2);
 		ok = 0;
 	}
 
 	if (!ok ||
 	    len1 != len2 ||
 	    memcmp(buf1, buf2, len1) != 0) {
-		printf("\nsize=%d ret1=%d ret2=%d\n", size, ret1, ret2);
+		printf("\nsize=%d ret1=%d ret2=%d\n", (int)size, (int)ret1, (int)ret2);
 		show_buf(" IN1:", inbuf, size-size_in1);
 		show_buf(" IN2:", inbuf, size-size_in2);
 		show_buf("OUT1:", buf1, len1);
@@ -248,7 +248,7 @@ static int test_buffer(uint8_t *inbuf, size_t size, const char *charset)
 
 	if (outsize3 != sizeof(buf3) - size) {
 		printf("wrong outsize3 - %d should be %d\n", 
-		       outsize3, sizeof(buf3) - size);
+		       (int)outsize3, (int)(sizeof(buf3) - size));
 		ok = 0;
 	}
 	
@@ -302,7 +302,7 @@ static int test_codepoint(unsigned int codepoint)
 
 	if (size2 != size) {
 		printf("next_codepoint(%u) gave wrong size %d (should be %d)\n", 
-		       codepoint, size2, size);
+		       codepoint, (int)size2, (int)size);
 		return 0;
 	}
 
diff --git a/source4/torture/local/idtree.c b/source4/torture/local/idtree.c
index 94463cefa6..d4a81cb567 100644
--- a/source4/torture/local/idtree.c
+++ b/source4/torture/local/idtree.c
@@ -64,7 +64,7 @@ BOOL torture_local_idtree(void)
 			if (p != NULL) {
 				printf("non-present at %d gave %p (would be %d)\n", 
 				       ii, p, 
-				       (((char *)p) - (char *)(&ids[0])) / sizeof(int));
+				       (int)(((char *)p) - (char *)(&ids[0])) / sizeof(int));
 				ret = False;
 			}
 			if (random() % 5) {
diff --git a/source4/torture/local/socket.c b/source4/torture/local/socket.c
index 8f8e10b3c5..ec0d3b1467 100644
--- a/source4/torture/local/socket.c
+++ b/source4/torture/local/socket.c
@@ -86,7 +86,7 @@ static BOOL test_udp(TALLOC_CTX *mem_ctx)
 		ret = False;
 	}
 	if (nread != size) {
-		printf("Unexpected recvfrom size %d should be %d\n", nread, size);
+		printf("Unexpected recvfrom size %d should be %d\n", (int)nread, (int)size);
 		ret = False;
 	}
 
@@ -107,7 +107,7 @@ static BOOL test_udp(TALLOC_CTX *mem_ctx)
 		ret = False;
 	}
 	if (nread != size) {
-		printf("Unexpected recvfrom size %d should be %d\n", nread, size);
+		printf("Unexpected recvfrom size %d should be %d\n", (int)nread, (int)size);
 		ret = False;
 	}
 	if (from_port != srv_port) {
@@ -191,7 +191,7 @@ static BOOL test_tcp(TALLOC_CTX *mem_ctx)
 		ret = False;
 	}
 	if (nread != size) {
-		printf("Unexpected recvfrom size %d should be %d\n", nread, size);
+		printf("Unexpected recvfrom size %d should be %d\n", (int)nread, (int)size);
 		ret = False;
 	}
 
@@ -215,7 +215,7 @@ static BOOL test_tcp(TALLOC_CTX *mem_ctx)
 		ret = False;
 	}
 	if (nread != size) {
-		printf("Unexpected recvfrom size %d should be %d\n", nread, size);
+		printf("Unexpected recvfrom size %d should be %d\n", (int)nread, (int)size);
 		ret = False;
 	}
 	if (from_port != srv_port) {
-- 
cgit