From: Tim Kientzle <kientzle@gmail.com>
Date: Tue, 10 Aug 2010 05:55:34 +0000 (-0400)
Subject: Correct some signed/unsigned mismatches on 64-bit platforms.
X-Git-Tag: v3.0.0a~898
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45de4f2bf515e6dc2231d88c5fde094392b97570;p=thirdparty%2Flibarchive.git

Correct some signed/unsigned mismatches on 64-bit platforms.

SVN-Revision: 2551
---

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 2d553076b..aa481b84b 100644
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -1242,7 +1242,7 @@ advance_file_pointer(struct archive_read_filter *filter, int64_t request)
 
 	/* Use up the copy buffer first. */
 	if (filter->avail > 0) {
-		min = minimum(request, filter->avail);
+		min = minimum(request, (int64_t)filter->avail);
 		filter->next += min;
 		filter->avail -= min;
 		request -= min;
@@ -1252,7 +1252,7 @@ advance_file_pointer(struct archive_read_filter *filter, int64_t request)
 
 	/* Then use up the client buffer. */
 	if (filter->client_avail > 0) {
-		min = minimum(request, filter->client_avail);
+		min = minimum(request, (int64_t)filter->client_avail);
 		filter->client_next += min;
 		filter->client_avail -= min;
 		request -= min;