ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use zlib_transfer_t * instead of void *

This commit is contained in:
twinaphex 2016-01-24 18:53:37 +01:00
parent cf94c0b6c0
commit cc69cfe6a7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-common/file/file_archive.c
View File

@ -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;
}

12
libretro-common/include/file/file_archive.h
View File

@ -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: