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)

4 files changed, 7 insertions, 7 deletions

diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index 8b473724dc..5046b860a3 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -46,7 +46,7 @@ void ndr_check_padding(struct ndr_pull *ndr, size_t n)
 		}
 	}
 	if (i<ofs2) {
-		DEBUG(0,("WARNING: Non-zero padding to %d: ", n));
+		DEBUG(0,("WARNING: Non-zero padding to %d: ", (int)n));
 		for (i=ndr->offset;i<ofs2;i++) {
 			DEBUG(0,("%02x ", ndr->data[i]));
 		}
diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c
index c806f62189..cf3c3ae97b 100644
--- a/source4/librpc/ndr/ndr_compression.c
+++ b/source4/librpc/ndr/ndr_compression.c
@@ -98,7 +98,7 @@ static NTSTATUS ndr_pull_compression_mszip(struct ndr_pull *subndr,
 
 	if (uncompressed.length != decompressed_len) {
 		return ndr_pull_error(subndr, NDR_ERR_COMPRESSION, "Bad uncompressed_len [%u] != [%d] (PULL)",
-				      uncompressed.length, decompressed_len);
+				      (int)uncompressed.length, (int)decompressed_len);
 	}
 
 	*comndr = *subndr;
diff --git a/source4/librpc/ndr/ndr_spoolss_buf.c b/source4/librpc/ndr/ndr_spoolss_buf.c
index d9f9522eda..2238a916a4 100644
--- a/source4/librpc/ndr/ndr_spoolss_buf.c
+++ b/source4/librpc/ndr/ndr_spoolss_buf.c
@@ -29,11 +29,11 @@
 	if (!r->in.buffer && r->in.offered != 0) {\
 		return ndr_push_error(ndr, NDR_ERR_BUFSIZE,\
 			"SPOOLSS Buffer: r->in.offered[%u] but there's no buffer",\
-			r->in.offered);\
+			(unsigned)r->in.offered);\
 	} else if (r->in.buffer && r->in.buffer->length != r->in.offered) {\
 		return ndr_push_error(ndr, NDR_ERR_BUFSIZE,\
 			"SPOOLSS Buffer: r->in.offered[%u] doesn't match length of r->in.buffer[%u]",\
-			r->in.offered, r->in.buffer->length);\
+			(unsigned)r->in.offered, (unsigned)r->in.buffer->length);\
 	}\
 	_r.in.level	= r->in.level;\
 	_r.in.buffer	= r->in.buffer;\
@@ -72,7 +72,7 @@
 		} else if (r->in.offered < _ndr_info->offset) {\
 			return ndr_push_error(ndr, NDR_ERR_BUFSIZE,\
 				"SPOOLSS Buffer: r->in.offered[%u] doesn't match length of out buffer[%u]!",\
-				r->in.offered, _ndr_info->offset);\
+				(unsigned)r->in.offered, (unsigned)_ndr_info->offset);\
 		}\
 		_data_blob_info = ndr_push_blob(_ndr_info);\
 		_r.out.info	= &_data_blob_info;\
@@ -466,7 +466,7 @@ NTSTATUS ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct
 		if (_r.out.data.length != r->in.offered) {
 			return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,\
 				"SPOOLSS Buffer: r->in.offered[%u] doesn't match length of out buffer[%u]",\
-				r->in.offered, _r.out.data.length);\
+				(unsigned)r->in.offered, (unsigned)_r.out.data.length);\
 		}
 		if (_r.out.data.length > 0 && r->out.needed <= _r.out.data.length) {
 			struct __spoolss_GetPrinterData __r;
diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index 88ed1923ca..6835213cf4 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -79,7 +79,7 @@ static void smb_read_callback(struct smbcli_request *req)
 
 	if (state->received < 16) {
 		DEBUG(0,("dcerpc_smb: short packet (length %d) in read callback!\n",
-			 state->received));
+			 (int)state->received));
 		pipe_dead(state->c, NT_STATUS_INFO_LENGTH_MISMATCH);
 		talloc_free(state);
 		return;