summaryrefslogtreecommitdiff
path: root/source4/libcli/raw
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-17 09:20:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:34 -0500
commite835621799647ee70630b389fb53d15b15d68355 (patch)
tree429a4ab67cf53f2853ba93f4628b63cd5aac2b02 /source4/libcli/raw
parentccc65fb995154451537879b57b900b8b4e340bd2 (diff)
downloadsamba-e835621799647ee70630b389fb53d15b15d68355.tar.gz
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)
Diffstat (limited to 'source4/libcli/raw')
-rw-r--r--source4/libcli/raw/rawfileinfo.c4
-rw-r--r--source4/libcli/raw/rawfsinfo.c4
-rw-r--r--source4/libcli/raw/rawsearch.c4
-rw-r--r--source4/libcli/raw/rawtrans.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index 9f7786429c2..ede4391824d 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 fd99c4aeb99..3daa1c0f53d 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 90715ca8e27..a9b49c07a4f 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 b523232bc05..207b5bee083 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;
}