mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(libretro-db) Style/code nits

Browse Source
This commit is contained in:
libretroadmin 2023-02-19 04:54:47 +01:00
parent 65b0098cc1
commit e65f273065
3 changed files with 80 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretro-db/bintree.c
View File

@ -87,17 +87,16 @@ int bintree_iterate(struct bintree_node *n, bintree_iter_cb cb, void *ctx)
void bintree_free(struct bintree_node *n) void bintree_free(struct bintree_node *n)
{ {
if (n->value == NIL_NODE) if (!n)
{
free(n);
return; return;
if (n->value != NIL_NODE)
{
n->value = NULL;
if (n->left)
bintree_free(n->left);
if (n->right)
bintree_free(n->right);
} }
n->value = NULL;
if (n->left)
bintree_free(n->left);
if (n->right)
bintree_free(n->right);
free(n); free(n);
} }

106
libretro-db/rmsgpack.c
View File

@ -189,40 +189,40 @@ int rmsgpack_write_string(RFILE *fd, const char *s, uint32_t len)
int rmsgpack_write_bin(RFILE *fd, const void *s, uint32_t len) int rmsgpack_write_bin(RFILE *fd, const void *s, uint32_t len)
{ {
uint8_t tmp_i8;
uint16_t tmp_i16;
uint32_t tmp_i32;
if (len == (uint8_t)len) if (len == (uint8_t)len)
{ {
static const uint8_t MPF_BIN8 = _MPF_BIN8; static const uint8_t MPF_BIN8 = _MPF_BIN8;
if (filestream_write(fd, &MPF_BIN8, sizeof(MPF_BIN8)) == -1) if (filestream_write(fd, &MPF_BIN8, sizeof(MPF_BIN8)) != -1)
return -1; {
tmp_i8 = (uint8_t)len; uint8_t tmp_i8 = (uint8_t)len;
if (filestream_write(fd, &tmp_i8, sizeof(uint8_t)) == -1) if (filestream_write(fd, &tmp_i8, sizeof(uint8_t)) != -1)
return -1; if (filestream_write(fd, s, len) != -1)
return 0;
}
} }
else if (len == (uint16_t)len) else if (len == (uint16_t)len)
{ {
static const uint8_t MPF_BIN16 = _MPF_BIN16; static const uint8_t MPF_BIN16 = _MPF_BIN16;
if (filestream_write(fd, &MPF_BIN16, sizeof(MPF_BIN16)) == -1) if (filestream_write(fd, &MPF_BIN16, sizeof(MPF_BIN16)) != -1)
return -1; {
tmp_i16 = swap_if_little16(len); uint16_t tmp_i16 = swap_if_little16(len);
if (filestream_write(fd, &tmp_i16, sizeof(uint16_t)) == -1) if (filestream_write(fd, &tmp_i16, sizeof(uint16_t)) != -1)
return -1; if (filestream_write(fd, s, len) != -1)
return 0;
}
} }
else else
{ {
static const uint8_t MPF_BIN32 = _MPF_BIN32; static const uint8_t MPF_BIN32 = _MPF_BIN32;
if (filestream_write(fd, &MPF_BIN32, sizeof(MPF_BIN32)) == -1) if (filestream_write(fd, &MPF_BIN32, sizeof(MPF_BIN32)) != -1)
return -1; {
tmp_i32 = swap_if_little32(len); uint32_t tmp_i32 = swap_if_little32(len);
if (filestream_write(fd, &tmp_i32, sizeof(uint32_t)) == -1) if (filestream_write(fd, &tmp_i32, sizeof(uint32_t)) != -1)
return -1; if (filestream_write(fd, s, len) != -1)
return 0;
}
} }
if (filestream_write(fd, s, len) == -1) return -1;
return -1;
return 0;
} }
int rmsgpack_write_nil(RFILE *fd) int rmsgpack_write_nil(RFILE *fd)
@ -370,7 +370,7 @@ int rmsgpack_write_uint(RFILE *fd, uint64_t value)
return written; return written;
} }
static int read_uint(RFILE *fd, uint64_t *out, size_t size) static int rmsgpack_read_uint(RFILE *fd, uint64_t *out, size_t size)
{ {
union { uint64_t u64; uint32_t u32; uint16_t u16; uint8_t u8; } tmp; union { uint64_t u64; uint32_t u32; uint16_t u16; uint8_t u8; } tmp;
@ -395,7 +395,7 @@ static int read_uint(RFILE *fd, uint64_t *out, size_t size)
return 0; return 0;
} }
static int read_int(RFILE *fd, int64_t *out, size_t size) static int rmsgpack_read_int(RFILE *fd, int64_t *out, size_t size)
{ {
union { uint64_t u64; uint32_t u32; uint16_t u16; uint8_t u8; } tmp; union { uint64_t u64; uint32_t u32; uint16_t u16; uint8_t u8; } tmp;
@ -420,12 +420,12 @@ static int read_int(RFILE *fd, int64_t *out, size_t size)
return 0; return 0;
} }
static int read_buff(RFILE *fd, size_t size, char **pbuff, uint64_t *len) static int rmsgpack_read_buff(RFILE *fd, size_t size, char **pbuff, uint64_t *len)
{ {
uint64_t tmp_len = 0; uint64_t tmp_len = 0;
ssize_t read_len = 0; ssize_t read_len = 0;
if (read_uint(fd, &tmp_len, size) == -1) if (rmsgpack_read_uint(fd, &tmp_len, size) == -1)
return -1; return -1;
*pbuff = (char *)malloc((size_t)(tmp_len + 1) * sizeof(char)); *pbuff = (char *)malloc((size_t)(tmp_len + 1) * sizeof(char));
@ -444,14 +444,14 @@ static int read_buff(RFILE *fd, size_t size, char **pbuff, uint64_t *len)
return 0; return 0;
} }
static int read_map(RFILE *fd, uint32_t len, static int rmsgpack_read_map(RFILE *fd, uint32_t len,
struct rmsgpack_read_callbacks *callbacks, void *data) struct rmsgpack_read_callbacks *callbacks, void *data)
{ {
int rv; int rv;
unsigned i; unsigned i;
if (callbacks->read_map_start && if ( ( callbacks->read_map_start)
(rv = callbacks->read_map_start(len, data)) < 0) && (rv = callbacks->read_map_start(len, data)) < 0)
return rv; return rv;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
@ -465,14 +465,14 @@ static int read_map(RFILE *fd, uint32_t len,
return 0; return 0;
} }
static int read_array(RFILE *fd, uint32_t len, static int rmsgpack_read_array(RFILE *fd, uint32_t len,
struct rmsgpack_read_callbacks *callbacks, void *data) struct rmsgpack_read_callbacks *callbacks, void *data)
{ {
int rv; int rv;
unsigned i; unsigned i;
if (callbacks->read_array_start && if ( ( callbacks->read_array_start)
(rv = callbacks->read_array_start(len, data)) < 0) && (rv = callbacks->read_array_start(len, data)) < 0)
return rv; return rv;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
@ -499,19 +499,19 @@ int rmsgpack_read(RFILE *fd,
if (type < MPF_FIXMAP) if (type < MPF_FIXMAP)
{ {
if (!callbacks->read_int) if (callbacks->read_int)
return 0; return callbacks->read_int(type, data);
return callbacks->read_int(type, data); return 0;
} }
else if (type < MPF_FIXARRAY) else if (type < MPF_FIXARRAY)
{ {
tmp_len = type - MPF_FIXMAP; tmp_len = type - MPF_FIXMAP;
return read_map(fd, (uint32_t)tmp_len, callbacks, data); return rmsgpack_read_map(fd, (uint32_t)tmp_len, callbacks, data);
} }
else if (type < MPF_FIXSTR) else if (type < MPF_FIXSTR)
{ {
tmp_len = type - MPF_FIXARRAY; tmp_len = type - MPF_FIXARRAY;
return read_array(fd, (uint32_t)tmp_len, callbacks, data); return rmsgpack_read_array(fd, (uint32_t)tmp_len, callbacks, data);
} }
else if (type < MPF_NIL) else if (type < MPF_NIL)
{ {
@ -525,18 +525,15 @@ int rmsgpack_read(RFILE *fd,
return -1; return -1;
} }
buff[read_len] = '\0'; buff[read_len] = '\0';
if (!callbacks->read_string) if (callbacks->read_string)
{ return callbacks->read_string(buff, (uint32_t)read_len, data);
free(buff); goto end;
return 0;
}
return callbacks->read_string(buff, (uint32_t)read_len, data);
} }
else if (type > MPF_MAP32) else if (type > MPF_MAP32)
{ {
if (!callbacks->read_int) if (callbacks->read_int)
return 0; return callbacks->read_int(type - 0xff - 1, data);
return callbacks->read_int(type - 0xff - 1, data); return 0;
} }
switch (type) switch (type)
@ -556,7 +553,7 @@ int rmsgpack_read(RFILE *fd,
case _MPF_BIN8: case _MPF_BIN8:
case _MPF_BIN16: case _MPF_BIN16:
case _MPF_BIN32: case _MPF_BIN32:
if ((rv = read_buff(fd, (size_t)(1 << (type - _MPF_BIN8)), if ((rv = rmsgpack_read_buff(fd, (size_t)(1 << (type - _MPF_BIN8)),
&buff, &tmp_len)) < 0) &buff, &tmp_len)) < 0)
return rv; return rv;
@ -569,7 +566,7 @@ int rmsgpack_read(RFILE *fd,
case _MPF_UINT64: case _MPF_UINT64:
tmp_len = UINT64_C(1) << (type - _MPF_UINT8); tmp_len = UINT64_C(1) << (type - _MPF_UINT8);
tmp_uint = 0; tmp_uint = 0;
if (read_uint(fd, &tmp_uint, (size_t)tmp_len) == -1) if (rmsgpack_read_uint(fd, &tmp_uint, (size_t)tmp_len) == -1)
return -1; return -1;
if (callbacks->read_uint) if (callbacks->read_uint)
@ -581,7 +578,7 @@ int rmsgpack_read(RFILE *fd,
case _MPF_INT64: case _MPF_INT64:
tmp_len = UINT64_C(1) << (type - _MPF_INT8); tmp_len = UINT64_C(1) << (type - _MPF_INT8);
tmp_int = 0; tmp_int = 0;
if (read_int(fd, &tmp_int, (size_t)tmp_len) == -1) if (rmsgpack_read_int(fd, &tmp_int, (size_t)tmp_len) == -1)
return -1; return -1;
if (callbacks->read_int) if (callbacks->read_int)
@ -590,7 +587,7 @@ int rmsgpack_read(RFILE *fd,
case _MPF_STR8: case _MPF_STR8:
case _MPF_STR16: case _MPF_STR16:
case _MPF_STR32: case _MPF_STR32:
if ((rv = read_buff(fd, (size_t)(1 << (type - _MPF_STR8)), &buff, &tmp_len)) < 0) if ((rv = rmsgpack_read_buff(fd, (size_t)(1 << (type - _MPF_STR8)), &buff, &tmp_len)) < 0)
return rv; return rv;
if (callbacks->read_string) if (callbacks->read_string)
@ -598,16 +595,17 @@ int rmsgpack_read(RFILE *fd,
break; break;
case _MPF_ARRAY16: case _MPF_ARRAY16:
case _MPF_ARRAY32: case _MPF_ARRAY32:
if (read_uint(fd, &tmp_len, 2<<(type - _MPF_ARRAY16)) == -1) if (rmsgpack_read_uint(fd, &tmp_len, 2<<(type - _MPF_ARRAY16)) == -1)
return -1; return -1;
return read_array(fd, (uint32_t)tmp_len, callbacks, data); return rmsgpack_read_array(fd, (uint32_t)tmp_len, callbacks, data);
case _MPF_MAP16: case _MPF_MAP16:
case _MPF_MAP32: case _MPF_MAP32:
if (read_uint(fd, &tmp_len, 2<<(type - _MPF_MAP16)) == -1) if (rmsgpack_read_uint(fd, &tmp_len, 2<<(type - _MPF_MAP16)) == -1)
return -1; return -1;
return read_map(fd, (uint32_t)tmp_len, callbacks, data); return rmsgpack_read_map(fd, (uint32_t)tmp_len, callbacks, data);
} }
end:
if (buff) if (buff)
free(buff); free(buff);
return 0; return 0;

40
libretro-db/rmsgpack_dom.c
View File

@ -49,11 +49,11 @@ static struct rmsgpack_dom_value *dom_reader_state_pop(
static int dom_reader_state_push( static int dom_reader_state_push(
struct dom_reader_state *s, struct rmsgpack_dom_value *v) struct dom_reader_state *s, struct rmsgpack_dom_value *v)
{ {
if ((s->i + 1) == MAX_DEPTH) if ((s->i + 1) == MAX_DEPTH)
return -1; return -1;
s->i++; s->i++;
s->stack[s->i] = v; s->stack[s->i] = v;
return 0; return 0;
} }
static int dom_read_nil(void *data) static int dom_read_nil(void *data)
@ -148,28 +148,28 @@ static int dom_read_map_start(uint32_t len, void *data)
static int dom_read_array_start(uint32_t len, void *data) static int dom_read_array_start(uint32_t len, void *data)
{ {
size_t i; size_t i;
struct dom_reader_state *dom_state = (struct dom_reader_state *)data; struct dom_reader_state *dom_state = (struct dom_reader_state *)data;
struct rmsgpack_dom_value *v = dom_reader_state_pop(dom_state); struct rmsgpack_dom_value *v = dom_reader_state_pop(dom_state);
struct rmsgpack_dom_value *items = NULL; struct rmsgpack_dom_value *items = NULL;
v->type = RDT_ARRAY; v->type = RDT_ARRAY;
v->val.array.len = len; v->val.array.len = len;
v->val.array.items = NULL; v->val.array.items = NULL;
if (!(items = (struct rmsgpack_dom_value *) if (!(items = (struct rmsgpack_dom_value *)
calloc(len, sizeof(*items)))) calloc(len, sizeof(*items))))
return -1; return -1;
v->val.array.items = items; v->val.array.items = items;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
if (dom_reader_state_push(dom_state, &items[i]) < 0) if (dom_reader_state_push(dom_state, &items[i]) < 0)
return -1; return -1;
} }
return 0; return 0;
} }
void rmsgpack_dom_value_free(struct rmsgpack_dom_value *v) void rmsgpack_dom_value_free(struct rmsgpack_dom_value *v)
@ -223,8 +223,7 @@ struct rmsgpack_dom_value *rmsgpack_dom_value_map_value(
int rmsgpack_dom_value_cmp( int rmsgpack_dom_value_cmp(
const struct rmsgpack_dom_value *a, const struct rmsgpack_dom_value *a,
const struct rmsgpack_dom_value *b const struct rmsgpack_dom_value *b)
)
{ {
if ((a != b) && (a->type == b->type)) if ((a != b) && (a->type == b->type))
{ {
@ -342,6 +341,7 @@ void rmsgpack_dom_value_print(struct rmsgpack_dom_value *obj)
printf("]"); printf("]");
} }
} }
int rmsgpack_dom_write(RFILE *fd, const struct rmsgpack_dom_value *obj) int rmsgpack_dom_write(RFILE *fd, const struct rmsgpack_dom_value *obj)
{ {
unsigned i; unsigned i;