summaryrefslogtreecommitdiff
path: root/difftool/extract.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-20 03:49:02 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-20 18:34:17 +0200
commit9486151f186e3664c8dd429fba94f9e539377d87 (patch)
treee2cb8caed78c3de99bf0c58a3c7b1ddd140efd40 /difftool/extract.c
parent08c22510ba901d73f2841434e7e6a2a688b31fa8 (diff)
sqfsdiff: remove squashfs-to-dir & dir-to-dir comparisons
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'difftool/extract.c')
-rw-r--r--difftool/extract.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/difftool/extract.c b/difftool/extract.c
index 9fec818..2e92710 100644
--- a/difftool/extract.c
+++ b/difftool/extract.c
@@ -39,14 +39,11 @@ static int extract(data_reader_t *data, file_info_t *fi,
int extract_files(sqfsdiff_t *sd, file_info_t *old, file_info_t *new,
const char *path)
{
- if (old != NULL && !sd->old_is_dir) {
- if (extract(sd->sqfs_old.data, old, "old", path))
- return -1;
- }
+ if (extract(sd->sqfs_old.data, old, "old", path))
+ return -1;
+
+ if (extract(sd->sqfs_new.data, new, "new", path))
+ return -1;
- if (new != NULL && !sd->new_is_dir) {
- if (extract(sd->sqfs_new.data, new, "new", path))
- return -1;
- }
return 0;
}