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

Extend the CMakeLists.txt in the apps directory to be usable as a standalone build, to link against other versions of json-c.

Browse Source 
Tweak json_parse.c slightly to allow it to build against older json-c versions.
This commit is contained in:
Eric Haszlakiewicz
2020-04-26 04:02:36 +00:00
parent 00272292a7
commit d9981f67dd
4 changed files with 139 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/json_parse.c
View File

@@ -8,7 +8,11 @@
#include <string.h>
#include <unistd.h>
#include "config.h"
#include "apps_config.h"
/* XXX for a regular program, these should be <json-c/foo.h>
* but that's inconvenient when building in the json-c source tree.
*/
#include "json_object.h"
#include "json_tokener.h"
#include "json_util.h"
@@ -23,6 +27,10 @@ static int show_output = 1;
static int strict_mode = 0;
static const char *fname = NULL;
#ifndef HAVE_JSON_TOKENER_GET_PARSE_END
#define json_tokener_get_parse_end(tok) ((tok)->char_offset)
#endif
static void usage(int exitval, const char *errmsg);
static void showmem(void);
static int parseit(int fd, int (*callback)(struct json_object *));
@@ -52,7 +60,11 @@ static int parseit(int fd, int (*callback)(struct json_object *))
fprintf(stderr, "unable to allocate json_tokener: %s\n", strerror(errno));
return 1;
}
json_tokener_set_flags(tok, JSON_TOKENER_STRICT | JSON_TOKENER_ALLOW_TRAILING_CHARS);
json_tokener_set_flags(tok, JSON_TOKENER_STRICT
#ifdef JSON_TOKENER_ALLOW_TRAILING_CHARS
| JSON_TOKENER_ALLOW_TRAILING_CHARS
#endif
);
// XXX push this into some kind of json_tokener_parse_fd API?
// json_object_from_fd isn't flexible enough, and mirroring