]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Remove now-unnecessary test workaround 684/head
authorNate Rosenblum <natr@google.com>
Wed, 13 Apr 2016 23:29:05 +0000 (16:29 -0700)
committerNate Rosenblum <natr@google.com>
Wed, 13 Apr 2016 23:29:41 +0000 (16:29 -0700)
libarchive/archive_read_disk_posix.c

index d134394904d5c33cd09b001a68083179425327cd..22a1f14c0e03f8208a23297456fbfa9e8845e4c1 100644 (file)
@@ -835,12 +835,8 @@ _archive_read_data_block(struct archive *_a, const void **buff,
        /*
         * Return an EOF unless we've read a leading empty sparse region, which
         * is used to represent fully-sparse files.
-        *
-        * TODO: it is not technically necessary to check for entry_tota == 0,
-        * but this simplifies some unit tests that expect to only read data
-        * regions with length > 0. Consider fixing these tests (test_sparse_basic).
        */
-       if (bytes == 0 && !(empty_sparse_region && t->entry_total == 0)) {
+       if (bytes == 0 && !empty_sparse_region) {
                /* Get EOF */
                t->entry_eof = 1;
                r = ARCHIVE_EOF;