]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Correct some signed/unsigned mismatches on 64-bit platforms.
authorTim Kientzle <kientzle@gmail.com>
Tue, 10 Aug 2010 05:55:34 +0000 (01:55 -0400)
committerTim Kientzle <kientzle@gmail.com>
Tue, 10 Aug 2010 05:55:34 +0000 (01:55 -0400)
SVN-Revision: 2551

libarchive/archive_read.c

index 2d553076baf7ec7e4b232960ac6ff2290120875c..aa481b84b45f3a89f1e6f339f8c5c25f93552d64 100644 (file)
@@ -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;