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)

13 files changed, 20 insertions, 20 deletions

diff --git a/source4/libcli/auth/session.c b/source4/libcli/auth/session.c
index b32e1d724d..22146cbfb3 100644
--- a/source4/libcli/auth/session.c
+++ b/source4/libcli/auth/session.c
@@ -179,7 +179,7 @@ NTSTATUS sess_decrypt_blob(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const DAT
 
 	if (blob->length < 8) {
 		DEBUG(0, ("Unexpected length %d in session crypted secret (BLOB)\n",
-			  blob->length));
+			  (int)blob->length));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 79cdff2437..4ffa40d134 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -93,7 +93,7 @@ static void cldap_socket_recv(struct cldap_socket *cldap)
 	blob.length = nread;
 
 	DEBUG(2,("Received cldap packet of length %d from %s:%d\n", 
-		 blob.length, src_addr, src_port));
+		 (int)blob.length, src_addr, src_port));
 
 	if (!asn1_load(&asn1, blob)) {
 		DEBUG(2,("Failed to setup for asn.1 decode\n"));
@@ -188,7 +188,7 @@ static void cldap_socket_send(struct cldap_socket *cldap)
 				       req->dest_addr, req->dest_port);
 		if (NT_STATUS_IS_ERR(status)) {
 			DEBUG(3,("Failed to send cldap request of length %u to %s:%d\n",
-				 req->encoded.length, req->dest_addr, req->dest_port));
+				 (unsigned)req->encoded.length, req->dest_addr, req->dest_port));
 			DLIST_REMOVE(cldap->send_queue, req);
 			talloc_free(req);
 			continue;
diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index d7707b7ec8..a304db9c9d 100644
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -89,7 +89,7 @@ NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_browse_packet);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to parse browse packet of length %d\n", 
-			 data.length));
+			 (int)data.length));
 		if (DEBUGLVL(10)) {
 			file_save("browse.dat", data.data, data.length);
 		}
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index aff9d2e182..e66e5ed52e 100644
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -64,7 +64,7 @@ static void dgm_socket_recv(struct nbt_dgram_socket *dgmsock)
 	blob.length = nread;
 
 	DEBUG(2,("Received dgram packet of length %d from %s:%d\n", 
-		 blob.length, src_addr, src_port));
+		 (int)blob.length, src_addr, src_port));
 
 	packet = talloc(tmp_ctx, struct nbt_dgram_packet);
 	if (packet == NULL) {
@@ -119,7 +119,7 @@ static void dgm_socket_send(struct nbt_dgram_socket *dgmsock)
 				       req->dest_addr, req->dest_port);
 		if (NT_STATUS_IS_ERR(status)) {
 			DEBUG(3,("Failed to send datagram of length %u to %s:%d\n",
-				 req->encoded.length, req->dest_addr, req->dest_port));
+				 (unsigned)req->encoded.length, req->dest_addr, req->dest_port));
 			DLIST_REMOVE(dgmsock->send_queue, req);
 			talloc_free(req);
 			continue;
diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index 9d3a0dbed9..dda77689de 100644
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -106,7 +106,7 @@ NTSTATUS dgram_mailslot_netlogon_parse(struct dgram_mailslot_handler *dgmslot,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to parse netlogon packet of length %d\n", 
-			 data.length));
+			 (int)data.length));
 		if (DEBUGLVL(10)) {
 			file_save("netlogon.dat", data.data, data.length);
 		}
diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index e4a24b0591..03d1266af0 100644
--- a/source4/libcli/dgram/ntlogon.c
+++ b/source4/libcli/dgram/ntlogon.c
@@ -106,7 +106,7 @@ NTSTATUS dgram_mailslot_ntlogon_parse(struct dgram_mailslot_handler *dgmslot,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_ntlogon_packet);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to parse ntlogon packet of length %d\n", 
-			 data.length));
+			 (int)data.length));
 		if (DEBUGLVL(10)) {
 			file_save("ntlogon.dat", data.data, data.length);
 		}
diff --git a/source4/libcli/nbt/nbtname.c b/source4/libcli/nbt/nbtname.c
index 36ffdc9af6..d7f0b1b077 100644
--- a/source4/libcli/nbt/nbtname.c
+++ b/source4/libcli/nbt/nbtname.c
@@ -171,7 +171,7 @@ NTSTATUS ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s)
 		if (complen >= 0x3F) {
 			return ndr_push_error(ndr, NDR_ERR_STRING,
 					      "component length %u[%08X] > 0x00003F",
-					      complen, complen);
+					      (unsigned)complen, (unsigned)complen);
 		}
 
 		compname = talloc_asprintf(ndr, "%c%*.*s",
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index 0401e68af8..f40ec84e77 100644
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -199,7 +199,7 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
 
 	if (DEBUGLVL(10)) {
 		DEBUG(10,("Received nbt packet of length %d from %s:%d\n", 
-			  blob.length, src_addr, src_port));
+			  (int)blob.length, src_addr, src_port));
 		NDR_PRINT_DEBUG(nbt_name_packet, packet);
 	}
 
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index 9f7786429c..ede4391824 100644
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -25,12 +25,12 @@
 /* local macros to make the code more readable */
 #define FINFO_CHECK_MIN_SIZE(size) if (blob->length < (size)) { \
       DEBUG(1,("Unexpected FILEINFO reply size %d for level %u - expected min of %d\n", \
-	       blob->length, parms->generic.level, (size))); \
+	       (int)blob->length, parms->generic.level, (size))); \
       return NT_STATUS_INFO_LENGTH_MISMATCH; \
 }
 #define FINFO_CHECK_SIZE(size) if (blob->length != (size)) { \
       DEBUG(1,("Unexpected FILEINFO reply size %d for level %u - expected %d\n", \
-	       blob->length, parms->generic.level, (size))); \
+	       (int)blob->length, parms->generic.level, (size))); \
       return NT_STATUS_INFO_LENGTH_MISMATCH; \
 }
 
diff --git a/source4/libcli/raw/rawfsinfo.c b/source4/libcli/raw/rawfsinfo.c
index fd99c4aeb9..3daa1c0f53 100644
--- a/source4/libcli/raw/rawfsinfo.c
+++ b/source4/libcli/raw/rawfsinfo.c
@@ -115,13 +115,13 @@ static NTSTATUS smb_raw_qfsinfo_blob_recv(struct smbcli_request *req,
 /* local macros to make the code more readable */
 #define QFS_CHECK_MIN_SIZE(size) if (blob.length < (size)) { \
       DEBUG(1,("Unexpected QFS reply size %d for level %u - expected min of %d\n", \
-	       blob.length, fsinfo->generic.level, (size))); \
+	       (int)blob.length, fsinfo->generic.level, (size))); \
       status = NT_STATUS_INFO_LENGTH_MISMATCH; \
       goto failed; \
 }
 #define QFS_CHECK_SIZE(size) if (blob.length != (size)) { \
       DEBUG(1,("Unexpected QFS reply size %d for level %u - expected %d\n", \
-	       blob.length, fsinfo->generic.level, (size))); \
+	       (int)blob.length, fsinfo->generic.level, (size))); \
       status = NT_STATUS_INFO_LENGTH_MISMATCH; \
       goto failed; \
 }
diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c
index 90715ca8e2..a9b49c07a4 100644
--- a/source4/libcli/raw/rawsearch.c
+++ b/source4/libcli/raw/rawsearch.c
@@ -643,7 +643,7 @@ NTSTATUS smb_raw_search_first(struct smbcli_tree *tree,
 	
 	if (p_blob.length < 10) {
 		DEBUG(1,("smb_raw_search_first: parms wrong size %d != expected_param_size\n",
-			p_blob.length));
+			(int)p_blob.length));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -688,7 +688,7 @@ NTSTATUS smb_raw_search_next(struct smbcli_tree *tree,
 	
 	if (p_blob.length != 8) {
 		DEBUG(1,("smb_raw_search_next: parms wrong size %d != expected_param_size\n",
-			p_blob.length));
+			(int)p_blob.length));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c
index b523232bc0..207b5bee08 100644
--- a/source4/libcli/raw/rawtrans.c
+++ b/source4/libcli/raw/rawtrans.c
@@ -219,7 +219,7 @@ struct smbcli_request *smb_raw_trans_send_backend(struct smbcli_tree *tree,
 	if (parms->in.params.length > UINT16_MAX ||
 	    parms->in.data.length > UINT16_MAX) {
 		DEBUG(3,("Attempt to send invalid trans2 request (params %u, data %u)\n",
-			 parms->in.params.length, parms->in.data.length));
+			 (unsigned)parms->in.params.length, (unsigned)parms->in.data.length));
 		return NULL;
 	}
 	    
diff --git a/source4/libcli/wins/winsrepl.c b/source4/libcli/wins/winsrepl.c
index 732b597c53..6b02cfb660 100644
--- a/source4/libcli/wins/winsrepl.c
+++ b/source4/libcli/wins/winsrepl.c
@@ -162,13 +162,13 @@ static void wrepl_handler_recv(struct wrepl_socket *wrepl_socket)
 	if (!NT_STATUS_IS_OK(req->status)) {
 		DEBUG(2,("Failed to parse incoming WINS packet - %s\n",
 			 nt_errstr(req->status)));
-		DEBUG(10,("packet length %d\n", req->buffer.length));
+		DEBUG(10,("packet length %d\n", (int)req->buffer.length));
 		NDR_PRINT_DEBUG(wrepl_packet, req->packet);
 		goto failed;
 	}
 
 	if (DEBUGLVL(10)) {
-		DEBUG(10,("Received WINS packet of length %d\n", req->buffer.length));
+		DEBUG(10,("Received WINS packet of length %d\n", (int)req->buffer.length));
 		NDR_PRINT_DEBUG(wrepl_packet, req->packet);
 	}
 
@@ -390,7 +390,7 @@ struct wrepl_request *wrepl_request_send(struct wrepl_socket *wrepl_socket,
 	if (!NT_STATUS_IS_OK(req->status)) goto failed;
 
 	if (DEBUGLVL(10)) {
-		DEBUG(10,("Sending WINS packet of length %d\n", req->buffer.length));
+		DEBUG(10,("Sending WINS packet of length %d\n", (int)req->buffer.length));
 		NDR_PRINT_DEBUG(wrepl_packet, &wrap.packet);
 	}