]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Remove unneeded condition code.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sat, 16 Apr 2011 04:18:25 +0000 (00:18 -0400)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sat, 16 Apr 2011 04:18:25 +0000 (00:18 -0400)
SVN-Revision: 3243

libarchive/archive_read_disk_posix.c
libarchive/archive_read_disk_windows.c

index 39ab80b3af06a70364d4c0ddfdc52b63578569ae..1bb854fcf748cb6ffea102a087476c0b2c8c3368 100644 (file)
@@ -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(). */
index 5e956f723284dd97cbc508e3c9c55103224b4f62..44b5f04d90ca1c9ec3c0ab5aeb422cf7a03332d3 100644 (file)
@@ -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 */