mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename zlib_ to file_archive_

Browse Source
This commit is contained in:
twinaphex 2016-01-24 22:17:11 +01:00
parent 44ec82362e
commit 9459cf6445
11 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content.c
View File

@ -76,7 +76,7 @@ static bool read_content_file(unsigned i, const char *path, void **buf,
{ {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
uint32_t *content_crc_ptr = NULL; uint32_t *content_crc_ptr = NULL;
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif
uint8_t *ret_buf = NULL; uint8_t *ret_buf = NULL;

2
database_info.h
View File

@ -55,7 +55,7 @@ typedef struct
size_t list_ptr; size_t list_ptr;
struct string_list *list; struct string_list *list;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
zlib_transfer_t state; file_archive_transfer_t state;
#endif #endif
} database_info_handle_t; } database_info_handle_t;

6
file_ops.c
View File

@ -43,7 +43,7 @@
#include "verbosity.h" #include "verbosity.h"
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
static const struct zlib_file_backend *stream_backend; static const struct file_archive_file_backend *stream_backend;
#ifdef HAVE_7ZIP #ifdef HAVE_7ZIP
#include "deps/7zip/7z.h" #include "deps/7zip/7z.h"
@ -394,7 +394,7 @@ static int zip_file_decompressed(const char *name, const char *valid_exts,
else else
{ {
int ret = 0; int ret = 0;
zlib_file_handle_t handle = {0}; file_archive_file_handle_t handle = {0};
handle.backend = file_archive_get_default_file_backend(); handle.backend = file_archive_get_default_file_backend();
if (!handle.backend->stream_decompress_data_to_file_init(&handle, cdata, csize, size)) if (!handle.backend->stream_decompress_data_to_file_init(&handle, cdata, csize, size))
return false; return false;
@ -434,7 +434,7 @@ static int read_zip_file(const char *path,
const char *needle, void **buf, const char *needle, void **buf,
const char* optional_outfile) const char* optional_outfile)
{ {
zlib_transfer_t zlib; file_archive_transfer_t zlib;
struct decomp_state st; struct decomp_state st;
bool returnerr = true; bool returnerr = true;
int ret = 0; int ret = 0;

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

@ -64,7 +64,7 @@ struct zip_extract_userdata
bool found_content; bool found_content;
}; };
enum zlib_compression_mode enum file_archive_compression_mode
{ {
ZLIB_MODE_UNCOMPRESSED = 0, ZLIB_MODE_UNCOMPRESSED = 0,
ZLIB_MODE_DEFLATE = 8 ZLIB_MODE_DEFLATE = 8
@ -77,13 +77,13 @@ typedef struct
#endif #endif
void *data; void *data;
size_t size; size_t size;
} zlib_file_data_t; } file_archive_file_data_t;
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
/* Closes, unmaps and frees. */ /* Closes, unmaps and frees. */
static void file_archive_free(void *handle) static void file_archive_free(void *handle)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)handle; file_archive_file_data_t *data = (file_archive_file_data_t*)handle;
if (!data) if (!data)
return; return;
@ -97,7 +97,7 @@ static void file_archive_free(void *handle)
static const uint8_t *file_archive_data(void *handle) static const uint8_t *file_archive_data(void *handle)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)handle; file_archive_file_data_t *data = (file_archive_file_data_t*)handle;
if (!data) if (!data)
return NULL; return NULL;
return (const uint8_t*)data->data; return (const uint8_t*)data->data;
@ -105,7 +105,7 @@ static const uint8_t *file_archive_data(void *handle)
static size_t file_archive_size(void *handle) static size_t file_archive_size(void *handle)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)handle; file_archive_file_data_t *data = (file_archive_file_data_t*)handle;
if (!data) if (!data)
return 0; return 0;
return data->size; return data->size;
@ -113,7 +113,7 @@ static size_t file_archive_size(void *handle)
static void *file_archive_open(const char *path) static void *file_archive_open(const char *path)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)calloc(1, sizeof(*data)); file_archive_file_data_t *data = (file_archive_file_data_t*)calloc(1, sizeof(*data));
if (!data) if (!data)
return NULL; return NULL;
@ -148,7 +148,7 @@ error:
/* Closes, unmaps and frees. */ /* Closes, unmaps and frees. */
static void file_archive_free(void *handle) static void file_archive_free(void *handle)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)handle; file_archive_file_data_t *data = (file_archive_file_data_t*)handle;
if (!data) if (!data)
return; return;
free(data->data); free(data->data);
@ -157,7 +157,7 @@ static void file_archive_free(void *handle)
static const uint8_t *file_archive_data(void *handle) static const uint8_t *file_archive_data(void *handle)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)handle; file_archive_file_data_t *data = (file_archive_file_data_t*)handle;
if (!data) if (!data)
return NULL; return NULL;
return (const uint8_t*)data->data; return (const uint8_t*)data->data;
@ -165,7 +165,7 @@ static const uint8_t *file_archive_data(void *handle)
static size_t file_archive_size(void *handle) static size_t file_archive_size(void *handle)
{ {
zlib_file_data_t *data = (zlib_file_data_t*)handle; file_archive_file_data_t *data = (file_archive_file_data_t*)handle;
if (!data) if (!data)
return 0; return 0;
return data->size; return data->size;
@ -175,7 +175,8 @@ static void *file_archive_open(const char *path)
{ {
ssize_t ret = -1; ssize_t ret = -1;
bool read_from_file = false; bool read_from_file = false;
zlib_file_data_t *data = (zlib_file_data_t*)calloc(1, sizeof(*data)); file_archive_file_data_t *data = (file_archive_file_data_t*)
calloc(1, sizeof(*data));
if (!data) if (!data)
return NULL; return NULL;
@ -293,7 +294,7 @@ static uint32_t read_le(const uint8_t *data, unsigned size)
} }
static int file_archive_parse_file_iterate_step_internal( static int file_archive_parse_file_iterate_step_internal(
zlib_transfer_t *state, char *filename, file_archive_transfer_t *state, char *filename,
const uint8_t **cdata, const uint8_t **cdata,
unsigned *cmode, uint32_t *size, uint32_t *csize, unsigned *cmode, uint32_t *size, uint32_t *csize,
uint32_t *checksum, unsigned *payback) uint32_t *checksum, unsigned *payback)
@ -331,7 +332,7 @@ static int file_archive_parse_file_iterate_step_internal(
return 1; return 1;
} }
static int file_archive_parse_file_iterate_step(zlib_transfer_t *state, static int file_archive_parse_file_iterate_step(file_archive_transfer_t *state,
const char *valid_exts, void *userdata, file_archive_file_cb file_cb) const char *valid_exts, void *userdata, file_archive_file_cb file_cb)
{ {
const uint8_t *cdata = NULL; const uint8_t *cdata = NULL;
@ -362,7 +363,7 @@ static int file_archive_parse_file_iterate_step(zlib_transfer_t *state,
return 1; return 1;
} }
static int file_archive_parse_file_init(zlib_transfer_t *state, static int file_archive_parse_file_init(file_archive_transfer_t *state,
const char *file) const char *file)
{ {
state->backend = file_archive_get_default_file_backend(); state->backend = file_archive_get_default_file_backend();
@ -413,7 +414,7 @@ static int file_archive_parse_file_init(zlib_transfer_t *state,
* Returns: true (1) on success, otherwise false (0). * Returns: true (1) on success, otherwise false (0).
**/ **/
static int file_archive_inflate_data_to_file( static int file_archive_inflate_data_to_file(
zlib_file_handle_t *handle, file_archive_file_handle_t *handle,
int ret, int ret,
const char *path, const char *path,
const char *valid_exts, const char *valid_exts,
@ -459,7 +460,7 @@ end:
} }
int file_archive_parse_file_iterate( int file_archive_parse_file_iterate(
zlib_transfer_t *state, file_archive_transfer_t *state,
bool *returnerr, bool *returnerr,
const char *file, const char *file,
const char *valid_exts, const char *valid_exts,
@ -505,7 +506,7 @@ int file_archive_parse_file_iterate(
return 0; return 0;
} }
void file_archive_parse_file_iterate_stop(zlib_transfer_t *state) void file_archive_parse_file_iterate_stop(file_archive_transfer_t *state)
{ {
if (!state || !state->handle) if (!state || !state->handle)
return; return;
@ -530,7 +531,7 @@ void file_archive_parse_file_iterate_stop(zlib_transfer_t *state)
bool file_archive_parse_file(const char *file, const char *valid_exts, bool file_archive_parse_file(const char *file, const char *valid_exts,
file_archive_file_cb file_cb, void *userdata) file_archive_file_cb file_cb, void *userdata)
{ {
zlib_transfer_t state = {0}; file_archive_transfer_t state = {0};
bool returnerr = true; bool returnerr = true;
state.type = ZLIB_TRANSFER_INIT; state.type = ZLIB_TRANSFER_INIT;
@ -547,7 +548,7 @@ bool file_archive_parse_file(const char *file, const char *valid_exts,
return returnerr; return returnerr;
} }
int file_archive_parse_file_progress(zlib_transfer_t *state) int file_archive_parse_file_progress(file_archive_transfer_t *state)
{ {
/* FIXME: this estimate is worse than before */ /* FIXME: this estimate is worse than before */
ptrdiff_t delta = state->directory - state->data; ptrdiff_t delta = state->directory - state->data;
@ -663,7 +664,7 @@ bool file_archive_perform_mode(const char *path, const char *valid_exts,
case ZLIB_MODE_DEFLATE: case ZLIB_MODE_DEFLATE:
{ {
int ret = 0; int ret = 0;
zlib_file_handle_t handle = {0}; file_archive_file_handle_t handle = {0};
handle.backend = file_archive_get_default_file_backend(); handle.backend = file_archive_get_default_file_backend();
if (!handle.backend->stream_decompress_data_to_file_init(&handle, if (!handle.backend->stream_decompress_data_to_file_init(&handle,
@ -687,7 +688,7 @@ bool file_archive_perform_mode(const char *path, const char *valid_exts,
return true; return true;
} }
const struct zlib_file_backend *file_archive_get_default_file_backend(void) const struct file_archive_file_backend *file_archive_get_default_file_backend(void)
{ {
return &zlib_backend; return &zlib_backend;
} }

4
libretro-common/file/file_archive_zlib.c
View File

@ -130,7 +130,7 @@ static bool zlib_stream_decompress_init(void *data)
} }
static bool zlib_stream_decompress_data_to_file_init( static bool zlib_stream_decompress_data_to_file_init(
zlib_file_handle_t *handle, file_archive_file_handle_t *handle,
const uint8_t *cdata, uint32_t csize, uint32_t size) const uint8_t *cdata, uint32_t csize, uint32_t size)
{ {
if (!handle) if (!handle)
@ -194,7 +194,7 @@ static uint32_t zlib_stream_crc32_calculate(uint32_t crc,
return crc32(crc, data, length); return crc32(crc, data, length);
} }
const struct zlib_file_backend zlib_backend = { const struct file_archive_file_backend zlib_backend = {
zlib_stream_new, zlib_stream_new,
zlib_stream_free, zlib_stream_free,
zlib_stream_set, zlib_stream_set,

2
libretro-common/formats/png/rpng.c
View File

@ -112,7 +112,7 @@ struct rpng_process_t
unsigned pos; unsigned pos;
} pass; } pass;
void *stream; void *stream;
const struct zlib_file_backend *stream_backend; const struct file_archive_file_backend *stream_backend;
}; };
struct rpng struct rpng

4
libretro-common/formats/png/rpng_encode.c
View File

@ -48,7 +48,7 @@ static void dword_write_be(uint8_t *buf, uint32_t val)
static bool png_write_crc(RFILE *file, const uint8_t *data, size_t size) static bool png_write_crc(RFILE *file, const uint8_t *data, size_t size)
{ {
uint8_t crc_raw[4] = {0}; uint8_t crc_raw[4] = {0};
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
uint32_t crc = stream_backend->stream_crc_calculate(0, data, size); uint32_t crc = stream_backend->stream_crc_calculate(0, data, size);
@ -215,7 +215,7 @@ static bool rpng_save_image(const char *path,
bool ret = true; bool ret = true;
struct png_ihdr ihdr = {0}; struct png_ihdr ihdr = {0};
const struct zlib_file_backend *stream_backend = NULL; const struct file_archive_file_backend *stream_backend = NULL;
size_t encode_buf_size = 0; size_t encode_buf_size = 0;
uint8_t *encode_buf = NULL; uint8_t *encode_buf = NULL;
uint8_t *deflate_buf = NULL; uint8_t *deflate_buf = NULL;

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

@ -28,7 +28,7 @@
#include <boolean.h> #include <boolean.h>
enum zlib_transfer_type enum file_archive_transfer_type
{ {
ZLIB_TRANSFER_NONE = 0, ZLIB_TRANSFER_NONE = 0,
ZLIB_TRANSFER_INIT, ZLIB_TRANSFER_INIT,
@ -37,15 +37,15 @@ enum zlib_transfer_type
ZLIB_TRANSFER_DEINIT_ERROR ZLIB_TRANSFER_DEINIT_ERROR
}; };
typedef struct zlib_handle typedef struct file_archive_handle
{ {
void *stream; void *stream;
uint8_t *data; uint8_t *data;
uint32_t real_checksum; uint32_t real_checksum;
const struct zlib_file_backend *backend; const struct file_archive_file_backend *backend;
} zlib_file_handle_t; } file_archive_file_handle_t;
struct zlib_file_backend struct file_archive_file_backend
{ {
void *(*stream_new)(void); void *(*stream_new)(void);
void (*stream_free)(void *); void (*stream_free)(void *);
@ -57,7 +57,7 @@ struct zlib_file_backend
void (*stream_decrement_total_out)(void *, unsigned); void (*stream_decrement_total_out)(void *, unsigned);
bool (*stream_decompress_init)(void *); bool (*stream_decompress_init)(void *);
bool (*stream_decompress_data_to_file_init)( bool (*stream_decompress_data_to_file_init)(
zlib_file_handle_t *, const uint8_t *, uint32_t, uint32_t); file_archive_file_handle_t *, const uint8_t *, uint32_t, uint32_t);
int (*stream_decompress_data_to_file_iterate)(void *); int (*stream_decompress_data_to_file_iterate)(void *);
void (*stream_compress_init)(void *, int); void (*stream_compress_init)(void *, int);
void (*stream_compress_free)(void *); void (*stream_compress_free)(void *);
@ -66,16 +66,16 @@ struct zlib_file_backend
const char *ident; const char *ident;
}; };
typedef struct zlib_transfer typedef struct file_archive_transfer
{ {
void *handle; void *handle;
const uint8_t *footer; const uint8_t *footer;
const uint8_t *directory; const uint8_t *directory;
const uint8_t *data; const uint8_t *data;
int32_t zip_size; int32_t zip_size;
enum zlib_transfer_type type; enum file_archive_transfer_type type;
const struct zlib_file_backend *backend; const struct file_archive_file_backend *backend;
} zlib_transfer_t; } file_archive_transfer_t;
/* Returns true when parsing should continue. False to stop. */ /* Returns true when parsing should continue. False to stop. */
@ -84,7 +84,7 @@ typedef int (*file_archive_file_cb)(const char *name, const char *valid_exts,
uint32_t crc32, void *userdata); uint32_t crc32, void *userdata);
/** /**
* zlib_parse_file: * file_archive_parse_file:
* @file : filename path of archive * @file : filename path of archive
* @valid_exts : Valid extensions of archive to be parsed. * @valid_exts : Valid extensions of archive to be parsed.
* If NULL, allow all. * If NULL, allow all.
@ -100,16 +100,16 @@ bool file_archive_parse_file(const char *file, const char *valid_exts,
file_archive_file_cb file_cb, void *userdata); file_archive_file_cb file_cb, void *userdata);
int file_archive_parse_file_iterate( int file_archive_parse_file_iterate(
zlib_transfer_t *state, file_archive_transfer_t *state,
bool *returnerr, bool *returnerr,
const char *file, const char *file,
const char *valid_exts, const char *valid_exts,
file_archive_file_cb file_cb, file_archive_file_cb file_cb,
void *userdata); void *userdata);
void file_archive_parse_file_iterate_stop(zlib_transfer_t *state); void file_archive_parse_file_iterate_stop(file_archive_transfer_t *state);
int file_archive_parse_file_progress(zlib_transfer_t *state); int file_archive_parse_file_progress(file_archive_transfer_t *state);
/** /**
* file_archive_extract_first_content_file: * file_archive_extract_first_content_file:
@ -144,11 +144,11 @@ bool file_archive_perform_mode(const char *name, const char *valid_exts,
struct string_list *compressed_file_list_new(const char *filename, struct string_list *compressed_file_list_new(const char *filename,
const char* ext); const char* ext);
void zlib_deflate_init(void *data, int level); void file_archive_deflate_init(void *data, int level);
const struct zlib_file_backend *file_archive_get_default_file_backend(void); const struct file_archive_file_backend *file_archive_get_default_file_backend(void);
const struct zlib_file_backend zlib_backend; const struct file_archive_file_backend zlib_backend;
#endif #endif

12
patch.c
View File

@ -55,7 +55,7 @@ static uint8_t bps_read(struct bps_data *bps)
{ {
uint8_t data = bps->modify_data[bps->modify_offset++]; uint8_t data = bps->modify_data[bps->modify_offset++];
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
bps->modify_checksum = ~stream_backend->stream_crc_calculate( bps->modify_checksum = ~stream_backend->stream_crc_calculate(
~bps->modify_checksum, &data, 1); ~bps->modify_checksum, &data, 1);
@ -83,7 +83,7 @@ static uint64_t bps_decode(struct bps_data *bps)
static void bps_write(struct bps_data *bps, uint8_t data) static void bps_write(struct bps_data *bps, uint8_t data)
{ {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif
if (!bps) if (!bps)
@ -107,7 +107,7 @@ patch_error_t bps_apply_patch(
uint32_t modify_source_checksum = 0, modify_target_checksum = 0, uint32_t modify_source_checksum = 0, modify_target_checksum = 0,
modify_modify_checksum = 0, checksum; modify_modify_checksum = 0, checksum;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif
@ -228,7 +228,7 @@ struct ups_data
static uint8_t ups_patch_read(struct ups_data *data) static uint8_t ups_patch_read(struct ups_data *data)
{ {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif
@ -246,7 +246,7 @@ static uint8_t ups_patch_read(struct ups_data *data)
static uint8_t ups_source_read(struct ups_data *data) static uint8_t ups_source_read(struct ups_data *data)
{ {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif
@ -264,7 +264,7 @@ static uint8_t ups_source_read(struct ups_data *data)
static void ups_target_write(struct ups_data *data, uint8_t n) static void ups_target_write(struct ups_data *data, uint8_t n)
{ {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif

4
tasks/task_database.c
View File

@ -180,7 +180,7 @@ static int database_info_iterate_playlist(
case HASH_EXTENSION_ZIP: case HASH_EXTENSION_ZIP:
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
db->type = DATABASE_TYPE_ITERATE_ZIP; db->type = DATABASE_TYPE_ITERATE_ZIP;
memset(&db->state, 0, sizeof(zlib_transfer_t)); memset(&db->state, 0, sizeof(file_archive_transfer_t));
db_state->zip_name[0] = '\0'; db_state->zip_name[0] = '\0';
db->state.type = ZLIB_TRANSFER_INIT; db->state.type = ZLIB_TRANSFER_INIT;
@ -203,7 +203,7 @@ static int database_info_iterate_playlist(
ssize_t ret; ssize_t ret;
int read_from = read_file(name, (void**)&db_state->buf, &ret); int read_from = read_file(name, (void**)&db_state->buf, &ret);
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
const struct zlib_file_backend *stream_backend = const struct file_archive_file_backend *stream_backend =
file_archive_get_default_file_backend(); file_archive_get_default_file_backend();
#endif #endif

2
tasks/task_decompress.c
View File

@ -37,7 +37,7 @@ typedef struct
char *callback_error; char *callback_error;
zlib_transfer_t zlib; file_archive_transfer_t zlib;
} decompress_state_t; } decompress_state_t;
static int file_decompressed_target_file(const char *name, const char *valid_exts, static int file_decompressed_target_file(const char *name, const char *valid_exts,