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

(rmsgpack.c) Dehardcode some magic numbers

Browse Source
This commit is contained in:
twinaphex 2015-09-17 10:39:43 +02:00
parent eee05742ba
commit e3c91b7eff
1 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
libretro-db/rmsgpack.c
View File

@ -31,6 +31,28 @@
#define _MPF_ARRAY16 0xdc #define _MPF_ARRAY16 0xdc
#define _MPF_ARRAY32 0xdd #define _MPF_ARRAY32 0xdd
#define _MPF_FIXSTR 0xa0
#define _MPF_STR8 0xd9
#define _MPF_STR16 0xda
#define _MPF_STR32 0xdb
#define _MPF_BIN8 0xc4
#define _MPF_BIN16 0xc5
#define _MPF_BIN32 0xc6
#define _MPF_FALSE 0xc2
#define _MPF_TRUE 0xc3
#define _MPF_INT8 0xd0
#define _MPF_INT16 0xd1
#define _MPF_INT32 0xd2
#define _MPF_INT64 0xd3
#define _MPF_UINT8 0xcc
#define _MPF_UINT16 0xcd
#define _MPF_UINT32 0xce
#define _MPF_UINT64 0xcf
#define _MPF_NIL 0xc0 #define _MPF_NIL 0xc0
static const uint8_t MPF_FIXMAP = _MPF_FIXMAP; static const uint8_t MPF_FIXMAP = _MPF_FIXMAP;
@ -41,27 +63,27 @@ static const uint8_t MPF_FIXARRAY = _MPF_FIXARRAY;
static const uint8_t MPF_ARRAY16 = _MPF_ARRAY16; static const uint8_t MPF_ARRAY16 = _MPF_ARRAY16;
static const uint8_t MPF_ARRAY32 = _MPF_ARRAY32; static const uint8_t MPF_ARRAY32 = _MPF_ARRAY32;
static const uint8_t MPF_FIXSTR = 0xa0; static const uint8_t MPF_FIXSTR = _MPF_FIXSTR;
static const uint8_t MPF_STR8 = 0xd9; static const uint8_t MPF_STR8 = _MPF_STR8;
static const uint8_t MPF_STR16 = 0xda; static const uint8_t MPF_STR16 = _MPF_STR16;
static const uint8_t MPF_STR32 = 0xdb; static const uint8_t MPF_STR32 = _MPF_STR32;
static const uint8_t MPF_BIN8 = 0xc4; static const uint8_t MPF_BIN8 = _MPF_BIN8;
static const uint8_t MPF_BIN16 = 0xc5; static const uint8_t MPF_BIN16 = _MPF_BIN16;
static const uint8_t MPF_BIN32 = 0xc6; static const uint8_t MPF_BIN32 = _MPF_BIN32;
static const uint8_t MPF_FALSE = 0xc2; static const uint8_t MPF_FALSE = _MPF_FALSE;
static const uint8_t MPF_TRUE = 0xc3; static const uint8_t MPF_TRUE = _MPF_TRUE;
static const uint8_t MPF_INT8 = 0xd0; static const uint8_t MPF_INT8 = _MPF_INT8;
static const uint8_t MPF_INT16 = 0xd1; static const uint8_t MPF_INT16 = _MPF_INT16;
static const uint8_t MPF_INT32 = 0xd2; static const uint8_t MPF_INT32 = _MPF_INT32;
static const uint8_t MPF_INT64 = 0xd3; static const uint8_t MPF_INT64 = _MPF_INT64;
static const uint8_t MPF_UINT8 = 0xcc; static const uint8_t MPF_UINT8 = _MPF_UINT8;
static const uint8_t MPF_UINT16 = 0xcd; static const uint8_t MPF_UINT16 = _MPF_UINT16;
static const uint8_t MPF_UINT32 = 0xce; static const uint8_t MPF_UINT32 = _MPF_UINT32;
static const uint8_t MPF_UINT64 = 0xcf; static const uint8_t MPF_UINT64 = _MPF_UINT64;
static const uint8_t MPF_NIL = _MPF_NIL; static const uint8_t MPF_NIL = _MPF_NIL;
@ -546,29 +568,29 @@ int rmsgpack_read(int fd,
if (callbacks->read_nil) if (callbacks->read_nil)
return callbacks->read_nil(data); return callbacks->read_nil(data);
break; break;
case 0xc2: case _MPF_FALSE:
if (callbacks->read_bool) if (callbacks->read_bool)
return callbacks->read_bool(0, data); return callbacks->read_bool(0, data);
break; break;
case 0xc3: case _MPF_TRUE:
if (callbacks->read_bool) if (callbacks->read_bool)
return callbacks->read_bool(1, data); return callbacks->read_bool(1, data);
break; break;
case 0xc4: case _MPF_BIN8:
case 0xc5: case _MPF_BIN16:
case 0xc6: case _MPF_BIN32:
if ((rv = read_buff(fd, 1<<(type - 0xc4), if ((rv = read_buff(fd, 1<<(type - _MPF_BIN8),
&buff, &tmp_len)) < 0) &buff, &tmp_len)) < 0)
return rv; return rv;
if (callbacks->read_bin) if (callbacks->read_bin)
return callbacks->read_bin(buff, tmp_len, data); return callbacks->read_bin(buff, tmp_len, data);
break; break;
case 0xcc: case _MPF_UINT8:
case 0xcd: case _MPF_UINT16:
case 0xce: case _MPF_UINT32:
case 0xcf: case _MPF_UINT64:
tmp_len = UINT32_C(1) << (type - 0xcc); tmp_len = UINT32_C(1) << (type - _MPF_UINT8);
tmp_uint = 0; tmp_uint = 0;
if (read_uint(fd, &tmp_uint, tmp_len) == -1) if (read_uint(fd, &tmp_uint, tmp_len) == -1)
goto error; goto error;
@ -576,11 +598,11 @@ int rmsgpack_read(int fd,
if (callbacks->read_uint) if (callbacks->read_uint)
return callbacks->read_uint(tmp_uint, data); return callbacks->read_uint(tmp_uint, data);
break; break;
case 0xd0: case _MPF_INT8:
case 0xd1: case _MPF_INT16:
case 0xd2: case _MPF_INT32:
case 0xd3: case _MPF_INT64:
tmp_len = UINT32_C(1) << (type - 0xd0); tmp_len = UINT32_C(1) << (type - _MPF_INT8);
tmp_int = 0; tmp_int = 0;
if (read_int(fd, &tmp_int, tmp_len) == -1) if (read_int(fd, &tmp_int, tmp_len) == -1)
goto error; goto error;
@ -588,10 +610,10 @@ int rmsgpack_read(int fd,
if (callbacks->read_int) if (callbacks->read_int)
return callbacks->read_int(tmp_int, data); return callbacks->read_int(tmp_int, data);
break; break;
case 0xd9: case _MPF_STR8:
case 0xda: case _MPF_STR16:
case 0xdb: case _MPF_STR32:
if ((rv = read_buff(fd, 1<<(type - 0xd9), &buff, &tmp_len)) < 0) if ((rv = read_buff(fd, 1<<(type - _MPF_STR8), &buff, &tmp_len)) < 0)
return rv; return rv;
if (callbacks->read_string) if (callbacks->read_string)