mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-22 06:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix code formatting

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2020-06-29 02:31:18 +00:00
parent 5f3bf70f03
commit a4e3700972
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
json_tokener.c
View File

@@ -202,7 +202,7 @@ struct json_object *json_tokener_parse_verbose(const char *str, enum json_tokene
*/
|| json_tokener_get_parse_end(tok) != strlen(str)
#endif
)
)
{
if (obj != NULL)
@@ -874,13 +874,10 @@ struct json_object *json_tokener_parse_ex(struct json_tokener *tok, const char *
}
}
while (c &&
((c >= '0' && c <= '9') ||
(!is_exponent && (c=='e' || c=='E')) ||
(neg_sign_ok && c=='-') ||
(pos_sign_ok && c=='+') ||
(!tok->is_double && c=='.')
))
while (c && ((c >= '0' && c <= '9') ||
(!is_exponent && (c == 'e' || c == 'E')) ||
(neg_sign_ok && c == '-') || (pos_sign_ok && c == '+') ||
(!tok->is_double && c == '.')))
{
pos_sign_ok = neg_sign_ok = 0;
++case_len;
@@ -922,10 +919,8 @@ struct json_object *json_tokener_parse_ex(struct json_tokener *tok, const char *
because c can be part of a new object to parse on the
next call to json_tokener_parse().
*/
if (tok->depth > 0 &&
c != ',' && c != ']' && c != '}' && c != '/' &&
c != 'I' && c != 'i' &&
!isspace((unsigned char)c))
if (tok->depth > 0 && c != ',' && c != ']' && c != '}' && c != '/' &&
c != 'I' && c != 'i' && !isspace((unsigned char)c))
{
tok->err = json_tokener_error_parse_number;
goto out;

4
tests/test_parse.c
View File

@@ -371,7 +371,7 @@ struct incremental_step
{"[0e-]", -1, -1, json_tokener_success, 1},
{"[0e-]", -1, 4, json_tokener_error_parse_number, 1, JSON_TOKENER_STRICT},
/* You might expect this to fail, but it won't because
/* You might expect this to fail, but it won't because
it's a valid partial parse; note the char_offset: */
{"0e+-", 5, 3, json_tokener_success, 1},
{"0e+-", 5, 3, json_tokener_error_parse_number, 1, JSON_TOKENER_STRICT},
@@ -453,7 +453,7 @@ struct incremental_step
{"{\"a\":1}{\"b\":2}", 15, 7, json_tokener_success, 0},
{&"{\"a\":1}{\"b\":2}"[7], 8, 7, json_tokener_success, 1},
/*
/*
* Though this may seem invalid at first glance, it
* parses as three separate numbers, 2015, -1 and -15
* Of course, simply pasting together a stream of arbitrary