From: Nate Rosenblum <natr@google.com>
Date: Wed, 13 Apr 2016 23:29:05 +0000 (-0700)
Subject: Remove now-unnecessary test workaround
X-Git-Tag: v3.2.0~2^2~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F684%2Fhead;p=thirdparty%2Flibarchive.git

Remove now-unnecessary test workaround
---

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index d13439490..22a1f14c0 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -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;