mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 00:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(cheevos.c) Further cleanups

Browse Source
This commit is contained in:
twinaphex 2016-09-29 20:38:52 +02:00
parent 9d439622c0
commit c42deb4cd3
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cheevos.c
View File

@ -1082,12 +1082,14 @@ static int cheevos_parse(const char *json)
ud.unofficial_count = 0; ud.unofficial_count = 0;
if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK) if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK)
{ goto error;
cheevos_unload();
return -1;
}
return 0; return 0;
error:
cheevos_unload();
return -1;
} }
/***************************************************************************** /*****************************************************************************
@ -1112,10 +1114,6 @@ uint8_t *cheevos_get_memory(const cheevos_var_t *var)
static unsigned cheevos_get_var_value(cheevos_var_t *var) static unsigned cheevos_get_var_value(cheevos_var_t *var)
{ {
unsigned previous = var->previous;
unsigned live_val = 0;
const uint8_t *memory = NULL;
if (var->type == CHEEVOS_VAR_TYPE_VALUE_COMP) if (var->type == CHEEVOS_VAR_TYPE_VALUE_COMP)
return var->value; return var->value;
@ -1123,7 +1121,8 @@ static unsigned cheevos_get_var_value(cheevos_var_t *var)
|| var->type == CHEEVOS_VAR_TYPE_DELTA_MEM) || var->type == CHEEVOS_VAR_TYPE_DELTA_MEM)
{ {
/* TODO Check with Scott if the bank id is needed */ /* TODO Check with Scott if the bank id is needed */
memory = cheevos_get_memory(var); const uint8_t *memory = cheevos_get_memory(var);
unsigned live_val = 0;
if (memory) if (memory)
{ {
@ -1156,11 +1155,10 @@ static unsigned cheevos_get_var_value(cheevos_var_t *var)
} }
} }
} }
else
live_val = 0;
if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM) if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM)
{ {
unsigned previous = var->previous;
var->previous = live_val; var->previous = live_val;
return previous; return previous;
} }
@ -1835,8 +1833,6 @@ static void cheevos_fill_md5(size_t size, size_t total, MD5_CTX *ctx)
char buffer[4096] = {0}; char buffer[4096] = {0};
ssize_t fill = total - size; ssize_t fill = total - size;
memset((void*)buffer, 0, sizeof(buffer));
while (fill > 0) while (fill > 0)
{ {
ssize_t len = sizeof(buffer); ssize_t len = sizeof(buffer);