Merge branch '2.3'
This commit is contained in:
commit
60fd7ab781
@ -13,13 +13,24 @@ static void file_not_found()
|
|||||||
{
|
{
|
||||||
json_t *json;
|
json_t *json;
|
||||||
json_error_t error;
|
json_error_t error;
|
||||||
|
char *pos;
|
||||||
|
|
||||||
json = json_load_file("/path/to/nonexistent/file.json", 0, &error);
|
json = json_load_file("/path/to/nonexistent/file.json", 0, &error);
|
||||||
if(json)
|
if(json)
|
||||||
fail("json_load_file returned non-NULL for a nonexistent file");
|
fail("json_load_file returned non-NULL for a nonexistent file");
|
||||||
if(error.line != -1)
|
if(error.line != -1)
|
||||||
fail("json_load_file returned an invalid line number");
|
fail("json_load_file returned an invalid line number");
|
||||||
if(strcmp(error.text, "unable to open /path/to/nonexistent/file.json: No such file or directory") != 0)
|
|
||||||
|
/* The error message is locale specific, only check the beginning
|
||||||
|
of the error message. */
|
||||||
|
|
||||||
|
pos = strchr(error.text, ':');
|
||||||
|
if(!pos)
|
||||||
|
fail("json_load_file returne an invalid error message");
|
||||||
|
|
||||||
|
*pos = '\0';
|
||||||
|
|
||||||
|
if(strcmp(error.text, "unable to open /path/to/nonexistent/file.json") != 0)
|
||||||
fail("json_load_file returned an invalid error message");
|
fail("json_load_file returned an invalid error message");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user