From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sat, 16 Apr 2011 04:18:25 +0000 (-0400)
Subject: Remove unneeded condition code.
X-Git-Tag: v3.0.0a~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29dcc79e37043ce6613eafe195dad718d5fa82a1;p=thirdparty%2Flibarchive.git

Remove unneeded condition code.

SVN-Revision: 3243
---

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 39ab80b3a..1bb854fcf 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -2216,11 +2216,7 @@ tree_close(struct tree *t)
 	if (t == NULL)
 		return;
 	if (t->entry_fd >= 0) {
-		if (t->flags & needsRestoreTimes)
-			close_and_restore_time(t->entry_fd, t,
-			    &t->restore_time);
-		else
-			close(t->entry_fd);
+		close_and_restore_time(t->entry_fd, t, &t->restore_time);
 		t->entry_fd = -1;
 	}
 	/* Close the handle of readdir(). */
diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 5e956f723..44b5f04d9 100644
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -1657,11 +1657,7 @@ tree_close(struct tree *t)
 	if (t == NULL)
 		return;
 	if (t->entry_fd >= 0) {
-		if (t->flags & needsRestoreTimes)
-			close_and_restore_time(t->entry_fd, t,
-			    &t->restore_time);
-		else
-			close(t->entry_fd);
+		close_and_restore_time(t->entry_fd, t, &t->restore_time);
 		t->entry_fd = -1;
 	}
 	/* Close the handle of FindFirstFileW */