ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(jsonsax) Preventing more namespace / symbol collisions in the future

This commit is contained in:
twinaphex 2015-10-09 20:58:18 +02:00
parent 14688de54a
commit 7f164647a2
1 changed files with 112 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libretro-common/formats/json/jsonsax.c
View File

@ -84,7 +84,7 @@ static INLINE void skip_digits( state_t* state )
static void jsonx_parse_value(state_t* state);
static void parse_object( state_t* state )
static void jsonx_parse_object( state_t* state )
{
state->json++; /* we're sure the current character is a '{' */
skip_spaces( state );
@ -135,7 +135,7 @@ static void parse_object( state_t* state )
HANDLE_0( end_object );
}
static void parse_array( state_t* state )
static void jsonx_parse_array(state_t* state)
{
unsigned int ndx = 0;
@ -183,7 +183,7 @@ static void jsonx_parse_string(state_t* state)
HANDLE_2( string, string, state->json - string - 1 );
}
static void parse_boolean( state_t* state )
static void jsonx_parse_boolean(state_t* state)
{
if ( !strncmp( state->json, "true", 4 ) )
{
@ -199,7 +199,7 @@ static void parse_boolean( state_t* state )
longjmp( state->env, JSONSAX_INVALID_VALUE );
}
static void parse_null( state_t* state )
static void jsonx_parse_null(state_t* state)
{
if ( !strncmp( state->json + 1, "ull", 3 ) ) /* we're sure the current character is a 'n' */
{
@ -210,7 +210,7 @@ static void parse_null( state_t* state )
longjmp( state->env, JSONSAX_INVALID_VALUE );
}
static void parse_number( state_t* state )
static void jsonx_parse_number(state_t* state)
{
const char* number = state->json;
@ -255,26 +255,21 @@ static void jsonx_parse_value(state_t* state)
switch ( *state->json )
{
case '{':
parse_object( state );
jsonx_parse_object(state);
break;
case '[':
parse_array( state );
jsonx_parse_array( state );
break;
case '"':
jsonx_parse_string( state );
break;
case 't':
case 'f':
parse_boolean( state );
jsonx_parse_boolean( state );
break;
case 'n':
parse_null( state );
jsonx_parse_null( state );
break;
case '0':
case '1':
case '2':
@ -286,7 +281,7 @@ static void jsonx_parse_value(state_t* state)
case '8':
case '9':
case '-':
parse_number( state );
jsonx_parse_number( state );
break;
default: