From f83c5d1a1b9df50cc8fa8df1bddd538c413b3014 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 12 Aug 2022 10:05:57 +0000 Subject: [PATCH] util: Drop unused archive_entry argument from copy function Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/util.h | 3 +-- src/libpakfire/snapshot.c | 5 +++-- src/libpakfire/util.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h index f44a1e3a8..1295b12a0 100644 --- a/src/libpakfire/include/pakfire/util.h +++ b/src/libpakfire/include/pakfire/util.h @@ -100,8 +100,7 @@ size_t pakfire_digest_length(enum pakfire_digests digest); // Archive Stuff -int pakfire_archive_copy_data(struct archive* src, struct archive* dst, - struct archive_entry* entry); +int pakfire_archive_copy_data(struct archive* src, struct archive* dst); int pakfire_archive_copy_data_to_buffer(struct pakfire* pakfire, struct archive* a, struct archive_entry* entry, char** data, size_t* data_size); diff --git a/src/libpakfire/snapshot.c b/src/libpakfire/snapshot.c index 1d1529b70..9bf0118c6 100644 --- a/src/libpakfire/snapshot.c +++ b/src/libpakfire/snapshot.c @@ -183,8 +183,9 @@ int pakfire_snapshot_create(struct pakfire* pakfire, FILE* f) { goto ERROR; } - if (archive_entry_size(entry) > 0) { - r = pakfire_archive_copy_data(reader, a, entry); + // Copy payload + if (archive_entry_filetype(entry) == AE_IFREG) { + r = pakfire_archive_copy_data(reader, a); if (r) { ERROR(pakfire, "Could not copy %s\n", archive_entry_pathname(entry)); diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index 1ada9d25e..ecbc531e8 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -1050,8 +1050,7 @@ size_t pakfire_digest_length(enum pakfire_digests digest) { // Archive Stuff -int pakfire_archive_copy_data(struct archive* src, struct archive* dst, - struct archive_entry* entry) { +int pakfire_archive_copy_data(struct archive* src, struct archive* dst) { const void* buffer; size_t size; off_t offset; -- 2.47.3