From 24db9c2daf9d4ecbdcd1819f0d082813ebdb89e3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Nov 2022 13:59:56 +0000 Subject: [PATCH] util: Drop unused function pakfire_archive_copy_data Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/util.h | 2 -- src/libpakfire/util.c | 31 --------------------------- 2 files changed, 33 deletions(-) diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h index 3d627d1e4..38123eb9f 100644 --- a/src/libpakfire/include/pakfire/util.h +++ b/src/libpakfire/include/pakfire/util.h @@ -76,8 +76,6 @@ int pakfire_tty_is_noninteractive(void); // Archive Stuff -int pakfire_archive_copy_data(struct pakfire* pakfire, - struct archive* src, struct archive* dst); int pakfire_archive_copy_data_from_file(struct pakfire* pakfire, struct archive* archive, FILE* f); int pakfire_archive_copy_data_to_buffer(struct pakfire* pakfire, struct archive* a, diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index 21bd2d49d..7ce4d1e0c 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -508,37 +508,6 @@ int pakfire_rmtree(const char* path, int flags) { // Archive Stuff -int pakfire_archive_copy_data(struct pakfire* pakfire, - struct archive* src, struct archive* dst) { - const void* buffer = NULL; - size_t size = 0; - off_t offset = 0; - - int r; - - for (;;) { - // Read a block of data - r = archive_read_data_block(src, &buffer, &size, &offset); - - // Exit if we have read everything from source - if (r == ARCHIVE_EOF) - return ARCHIVE_OK; - - // Catch any reading errors - else if (r) { - ERROR(pakfire, "Read error: %s\n", archive_error_string(src)); - return r; - } - - // Write the read block of data - r = archive_write_data(dst, buffer, size); - if (r < 0) { - ERROR(pakfire, "Write error: %s\n", archive_error_string(dst)); - return r; - } - } -} - int pakfire_archive_copy_data_from_file(struct pakfire* pakfire, struct archive* archive, FILE* f) { char buffer[BUFFER_SIZE]; -- 2.39.5