]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge from trunk: Minor compiler warning cleanup.
authorTim Kientzle <kientzle@gmail.com>
Tue, 10 Jan 2012 07:04:23 +0000 (02:04 -0500)
committerTim Kientzle <kientzle@gmail.com>
Tue, 10 Jan 2012 07:04:23 +0000 (02:04 -0500)
SVN-Revision: 4114

libarchive/test/read_open_memory.c

index 49cb8858283a6d2b0535df63f2d6a329bfee7e91..d7e203b20e8d272e4087b2f40f40d1a32d089c22 100644 (file)
@@ -137,7 +137,7 @@ static ssize_t
 memory_read(struct archive *a, void *client_data, const void **buff)
 {
        struct read_memory_data *mine = (struct read_memory_data *)client_data;
-       size_t size;
+       ssize_t size;
 
        (void)a; /* UNUSED */
        size = mine->end - mine->p;
@@ -145,7 +145,7 @@ memory_read(struct archive *a, void *client_data, const void **buff)
                buff = NULL;
                return 0;
        }
-       if (size > mine->read_size)
+       if ((size_t)size > mine->read_size)
                size = mine->read_size;
        else
                memset(mine->copy_buff, 0xA5, mine->copy_buff_size);