Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Changes needed after jsmn subtree upgrade

Browse Source
This commit is contained in:
Aaron Culliney 2016-03-09 22:21:15 -08:00
parent 10d9cc3c66
commit fdfe312a2b
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/json_parse.c
View File

@ -168,7 +168,7 @@ static bool _json_prettyPrint(JSON_s *parsedData, int start, int end, const unsi
break;
}
idx += tok.skip;
} else if (type == JSMN_ARRAY) {
} else if (type == JSMN_ARRAY) {
if (!_json_write("[ ", 2, fd)) {
break;
}
@ -204,7 +204,7 @@ static bool _json_prettyPrint(JSON_s *parsedData, int start, int end, const unsi
static int _json_createFromString(const char *jsonString, INOUT JSON_ref *jsonRef, ssize_t jsonLen) {
jsmnerr_t errCount = JSMN_ERROR_NOMEM;
int errCount = JSMN_ERROR_NOMEM;
do {
jsmn_parser parser = { 0 };
@ -243,7 +243,7 @@ static int _json_createFromString(const char *jsonString, INOUT JSON_ref *jsonRe
parsedData->jsonTokens = newTokens;
}
jsmn_init(&parser);
errCount = jsmn_parse(&parser, jsonString, jsonLen, parsedData->jsonTokens, numTokens-(numTokens/2));
errCount = jsmn_parse(&parser, jsonString, jsonLen, parsedData->jsonTokens, numTokens);
} while (errCount == JSMN_ERROR_NOMEM);
if (errCount == JSMN_ERROR_NOMEM) {
@ -290,7 +290,7 @@ int json_createFromFD(int fd, INOUT JSON_ref *jsonRef) {
ssize_t jsonLen = 0;
char *jsonString = NULL;
jsmnerr_t errCount = JSMN_ERROR_NOMEM;
int errCount = JSMN_ERROR_NOMEM;
do {
if (!jsonRef) {
@ -347,7 +347,7 @@ int json_createFromFD(int fd, INOUT JSON_ref *jsonRef) {
int json_createFromFile(const char *filePath, INOUT JSON_ref *jsonRef) {
int fd = -1;
jsmnerr_t errCount = JSMN_ERROR_NOMEM;
int errCount = JSMN_ERROR_NOMEM;
do {
if (!filePath) {
break;
@ -440,7 +440,7 @@ int json_mapCopyJSON(const JSON_ref jsonRef, const char *key, INOUT JSON_ref *va
JSON_s *map = (JSON_s *)jsonRef;
int idx = 0;
jsmnerr_t errCount = JSMN_ERROR_NOMEM;
int errCount = JSMN_ERROR_NOMEM;
do {
bool foundMatch = _json_mapGetStringValue(map, key, &idx);
if (!foundMatch) {

6
src/json_parse.h
View File

@ -21,13 +21,13 @@ typedef const struct JSON_s *JSON_ref;
// ----------------------------------------------------------------------------
// constructors
// parses string into tokens. returns positive token count or negative jsmnerr_t error code.
// parses string into tokens. returns positive token count or negative jsmnerr error code.
int json_createFromString(const char *jsonString, INOUT JSON_ref *jsonRef);
// parses file into string and tokens. returns positive token count or negative jsmnerr_t error code.
// parses file into string and tokens. returns positive token count or negative jsmnerr error code.
int json_createFromFile(const char *filePath, INOUT JSON_ref *jsonRef);
// parses FD into string and tokens. returns positive token count or negative jsmnerr_t error code.
// parses FD into string and tokens. returns positive token count or negative jsmnerr error code.
int json_createFromFD(int fd, INOUT JSON_ref *jsonRef);
// ----------------------------------------------------------------------------

8
src/test/testprefs.c
View File

@ -340,7 +340,7 @@ TEST test_json_serialization_pretty() {
TEST test_json_invalid_bareKey() {
JSON_ref parsedData = NULL;
jsmnerr_t errCount = (jsmnerr_t)json_createFromString("{ aBareKey : \"aNonBareVal\" }", &parsedData);
int errCount = json_createFromString("{ aBareKey : \"aNonBareVal\" }", &parsedData);
ASSERT(errCount == JSMN_ERROR_INVAL);
json_destroy(&parsedData);
@ -351,7 +351,7 @@ TEST test_json_invalid_bareKey() {
TEST test_json_invalid_bareVal() {
JSON_ref parsedData = NULL;
jsmnerr_t errCount = (jsmnerr_t)json_createFromString("{ \"aNonBareKey\" : aBareVal }", &parsedData);
int errCount = json_createFromString("{ \"aNonBareKey\" : aBareVal }", &parsedData);
ASSERT(errCount == JSMN_ERROR_INVAL);
json_destroy(&parsedData);
@ -362,7 +362,7 @@ TEST test_json_invalid_bareVal() {
TEST test_json_map_invalid_danglingComma() {
JSON_ref parsedData = NULL;
jsmnerr_t errCount = (jsmnerr_t)json_createFromString("{ \"aNonBareKey\" : \"aNonBareVal\", }", &parsedData);
int errCount = json_createFromString("{ \"aNonBareKey\" : \"aNonBareVal\", }", &parsedData); // BUG IN JSMN ...
ASSERT(errCount == JSMN_ERROR_INVAL);
json_destroy(&parsedData);
@ -373,7 +373,7 @@ TEST test_json_map_invalid_danglingComma() {
TEST test_json_map_invalid_danglingKey() {
JSON_ref parsedData = NULL;
jsmnerr_t errCount = (jsmnerr_t)json_createFromString("{ \"aNonBareKey\" : \"aNonBareVal\", \"aNoneBareButDanglingKey\" }", &parsedData);
int errCount = json_createFromString("{ \"aNonBareKey\" : \"aNonBareVal\", \"aNoneBareButDanglingKey\" }", &parsedData); // BUG IN JSMN ...
ASSERT(errCount == JSMN_ERROR_INVAL);
json_destroy(&parsedData);