From 8c7d97001f498642ff6fc92188e66a057763d096 Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Mon, 28 Dec 2015 12:05:21 -0500 Subject: [PATCH] Fix size_t/off_t size warnings --- contrib/libzip/zip_close.c | 2 +- contrib/libzip/zip_error_to_str.c | 4 ++-- contrib/libzip/zip_source_buffer.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/libzip/zip_close.c b/contrib/libzip/zip_close.c index e8dd9d60..c213d0a4 100644 --- a/contrib/libzip/zip_close.c +++ b/contrib/libzip/zip_close.c @@ -541,7 +541,7 @@ write_cdir(struct zip *za, const struct zip_filelist *filelist, zip_uint64_t sur /* fix up torrentzip comment */ - if (_zip_filerange_crc(out, cd_start, size, &crc, &za->error) < 0) + if (_zip_filerange_crc(out, cd_start, (off_t)size, &crc, &za->error) < 0) return -1; snprintf(buf, sizeof(buf), "%08lX", (long)crc); diff --git a/contrib/libzip/zip_error_to_str.c b/contrib/libzip/zip_error_to_str.c index 11a0cd2b..fce676d6 100644 --- a/contrib/libzip/zip_error_to_str.c +++ b/contrib/libzip/zip_error_to_str.c @@ -48,7 +48,7 @@ zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) const char *zs, *ss; if (ze < 0 || ze >= _zip_nerr_str) - return snprintf(buf, len, "Unknown error %d", ze); + return snprintf(buf, (size_t)len, "Unknown error %d", ze); zs = _zip_err_str[ze]; @@ -65,6 +65,6 @@ zip_error_to_str(char *buf, zip_uint64_t len, int ze, int se) ss = NULL; } - return snprintf(buf, len, "%s%s%s", + return snprintf(buf, (size_t)len, "%s%s%s", zs, (ss ? ": " : ""), (ss ? ss : "")); } diff --git a/contrib/libzip/zip_source_buffer.c b/contrib/libzip/zip_source_buffer.c index 8a13e760..aecde55e 100644 --- a/contrib/libzip/zip_source_buffer.c +++ b/contrib/libzip/zip_source_buffer.c @@ -103,7 +103,7 @@ read_data(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) n = len; if (n) { - memcpy(buf, z->buf, n); + memcpy(buf, z->buf, (size_t)n); z->buf += n; }