mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify load_content_into_memory

Browse Source
This commit is contained in:
twinaphex 2016-09-21 04:03:31 +02:00
parent 0672051b37
commit 7edc0d9ee9
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tasks/task_content.c
View File

@ -319,7 +319,6 @@ static bool read_content_file(unsigned i, const char *path, void **buf,
{ {
uint32_t *content_crc_ptr = NULL; uint32_t *content_crc_ptr = NULL;
uint8_t *ret_buf = NULL; uint8_t *ret_buf = NULL;
global_t *global = global_get_ptr();
RARCH_LOG("%s: %s.\n", RARCH_LOG("%s: %s.\n",
msg_hash_to_str(MSG_LOADING_CONTENT_FILE), path); msg_hash_to_str(MSG_LOADING_CONTENT_FILE), path);
@ -329,18 +328,22 @@ static bool read_content_file(unsigned i, const char *path, void **buf,
if (*length < 0) if (*length < 0)
return false; return false;
if (i != 0) if (i == 0)
return true; {
global_t *global = global_get_ptr();
/* First content file is significant, attempt to do patching,
* CRC checking, etc. */
/* Attempt to apply a patch. */ /* Attempt to apply a patch. */
if (!global->patch.block_patch) if (!global->patch.block_patch)
patch_content(&ret_buf, length); patch_content(&ret_buf, length);
content_get_crc(&content_crc_ptr); content_get_crc(&content_crc_ptr);
*content_crc_ptr = encoding_crc32(0, ret_buf, *length); *content_crc_ptr = encoding_crc32(0, ret_buf, *length);
RARCH_LOG("CRC32: 0x%x .\n", (unsigned)*content_crc_ptr); RARCH_LOG("CRC32: 0x%x .\n", (unsigned)*content_crc_ptr);
}
*buf = ret_buf; *buf = ret_buf;
@ -354,19 +357,10 @@ static bool load_content_into_memory(
unsigned i, unsigned i,
const char *path) const char *path)
{ {
ssize_t len; ssize_t len = 0;
bool ret = false; bool ret = read_content_file(i, path, (void**)&info->data, &len);
if (i == 0) if (!ret)
{
/* First content file is significant, attempt to do patching,
* CRC checking, etc. */
ret = read_content_file(i, path, (void**)&info->data, &len);
}
else
ret = content_file_read(path, (void**)&info->data, &len);
if (!ret || len < 0)
goto error; goto error;
info->size = len; info->size = len;