From cc69cfe6a70cc4f53ec3a72dbe7bb3dd7f3e43da Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 24 Jan 2016 18:53:37 +0100 Subject: [PATCH] Use zlib_transfer_t * instead of void * --- libretro-common/file/file_archive.c | 12 ++++-------- libretro-common/include/file/file_archive.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libretro-common/file/file_archive.c b/libretro-common/file/file_archive.c index e79218399f..35e908c705 100644 --- a/libretro-common/file/file_archive.c +++ b/libretro-common/file/file_archive.c @@ -506,11 +506,9 @@ static int file_archive_parse_file_init(zlib_transfer_t *state, return 0; } -int file_archive_parse_file_iterate(void *data, bool *returnerr, const char *file, +int file_archive_parse_file_iterate(zlib_transfer_t *state, bool *returnerr, const char *file, const char *valid_exts, file_archive_file_cb file_cb, void *userdata) { - zlib_transfer_t *state = (zlib_transfer_t*)data; - if (!state) return -1; @@ -552,14 +550,13 @@ int file_archive_parse_file_iterate(void *data, bool *returnerr, const char *fil return 0; } -void file_archive_parse_file_iterate_stop(void *data) +void file_archive_parse_file_iterate_stop(zlib_transfer_t *state) { - zlib_transfer_t *state = (zlib_transfer_t*)data; if (!state || !state->handle) return; state->type = ZLIB_TRANSFER_DEINIT; - file_archive_parse_file_iterate(data, NULL, NULL, NULL, NULL, NULL); + file_archive_parse_file_iterate(state, NULL, NULL, NULL, NULL, NULL); } /** @@ -595,10 +592,9 @@ bool file_archive_parse_file(const char *file, const char *valid_exts, return returnerr; } -int file_archive_parse_file_progress(void *data) +int file_archive_parse_file_progress(zlib_transfer_t *state) { /* FIXME: this estimate is worse than before */ - zlib_transfer_t *state = (zlib_transfer_t*)data; ptrdiff_t delta = state->directory - state->data; return delta * 100 / state->zip_size; } diff --git a/libretro-common/include/file/file_archive.h b/libretro-common/include/file/file_archive.h index 79556b8d6b..b9847dc368 100644 --- a/libretro-common/include/file/file_archive.h +++ b/libretro-common/include/file/file_archive.h @@ -88,13 +88,17 @@ uint32_t file_archive_crc32_calculate(uint32_t crc, const uint8_t *data, size_t bool file_archive_parse_file(const char *file, const char *valid_exts, file_archive_file_cb file_cb, void *userdata); -int file_archive_parse_file_iterate(void *data, bool *returnerr, +int file_archive_parse_file_iterate( + zlib_transfer_t *state, + bool *returnerr, const char *file, - const char *valid_exts, file_archive_file_cb file_cb, void *userdata); + const char *valid_exts, + file_archive_file_cb file_cb, + void *userdata); -void file_archive_parse_file_iterate_stop(void *data); +void file_archive_parse_file_iterate_stop(zlib_transfer_t *state); -int file_archive_parse_file_progress(void *data); +int file_archive_parse_file_progress(zlib_transfer_t *state); /** * file_archive_extract_first_content_file: