FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce code duplication in the decoder

Browse Source
This commit is contained in:
Petri Lehtinen 2011-05-29 12:53:25 +03:00
parent 013b8b3f60
commit 9febdf333c
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/load.c
View File

@ -815,13 +815,26 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error) static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
{ {
json_t *result;
lex_scan(lex, error); lex_scan(lex, error);
if(lex->token != '[' && lex->token != '{') { if(lex->token != '[' && lex->token != '{') {
error_set(error, lex, "'[' or '{' expected"); error_set(error, lex, "'[' or '{' expected");
return NULL; return NULL;
} }
return parse_value(lex, flags, error); result = parse_value(lex, flags, error);
if(!result)
return NULL;
lex_scan(lex, error);
if(lex->token != TOKEN_EOF) {
error_set(error, lex, "end of file expected");
json_decref(result);
result = NULL;
}
return result;
} }
typedef struct typedef struct
@ -857,19 +870,8 @@ json_t *json_loads(const char *string, size_t flags, json_error_t *error)
return NULL; return NULL;
jsonp_error_init(error, "<string>"); jsonp_error_init(error, "<string>");
result = parse_json(&lex, flags, error); result = parse_json(&lex, flags, error);
if(!result)
goto out;
lex_scan(&lex, error);
if(lex.token != TOKEN_EOF) {
error_set(error, &lex, "end of file expected");
json_decref(result);
result = NULL;
}
out:
lex_close(&lex); lex_close(&lex);
return result; return result;
} }
@ -907,19 +909,8 @@ json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t
return NULL; return NULL;
jsonp_error_init(error, "<buffer>"); jsonp_error_init(error, "<buffer>");
result = parse_json(&lex, flags, error); result = parse_json(&lex, flags, error);
if(!result)
goto out;
lex_scan(&lex, error);
if(lex.token != TOKEN_EOF) {
error_set(error, &lex, "end of file expected");
json_decref(result);
result = NULL;
}
out:
lex_close(&lex); lex_close(&lex);
return result; return result;
} }
@ -939,19 +930,8 @@ json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
source = "<stream>"; source = "<stream>";
jsonp_error_init(error, source); jsonp_error_init(error, source);
result = parse_json(&lex, flags, error); result = parse_json(&lex, flags, error);
if(!result)
goto out;
lex_scan(&lex, error);
if(lex.token != TOKEN_EOF) {
error_set(error, &lex, "end of file expected");
json_decref(result);
result = NULL;
}
out:
lex_close(&lex); lex_close(&lex);
return result; return result;
} }