diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-11-20 03:15:47 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-20 05:04:11 +0000 |
| commit | 811d5f7faca8af0fac5ad6b06da871ca9f87cdd7 (patch) | |
| tree | 606fd11b00ebacfb4d5e5416b339ca0d5ffe4b4b /wsutil/wsjson.c | |
| parent | 656cc19fc7de25c3ac7f9d847c37745ccc272247 (diff) | |
Drop JSON-GLib completely
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer
necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h).
Remove the remaining traces and additionally remove GObject from
FindGLIB2.cmake since it was only added for JSON-GLib.
Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0
Reviewed-on: https://code.wireshark.org/review/30733
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil/wsjson.c')
| -rw-r--r-- | wsutil/wsjson.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/wsutil/wsjson.c b/wsutil/wsjson.c index dd10832bfb..b6a8ddeb4a 100644 --- a/wsutil/wsjson.c +++ b/wsutil/wsjson.c @@ -20,19 +20,10 @@ #include <wsutil/unicode-utils.h> #include "log.h" -#ifdef HAVE_JSONGLIB -#include <json-glib/json-glib.h> -#endif - gboolean json_validate(const guint8 *buf, const size_t len) { gboolean ret = TRUE; -#ifdef HAVE_JSONGLIB - JsonParser *parser = json_parser_new(); - ret = json_parser_load_from_data(parser, buf, len, NULL); - g_object_unref(parser); -#else /* We expect no more than 1024 tokens */ guint max_tokens = 1024; jsmntok_t* t; @@ -66,7 +57,6 @@ json_validate(const guint8 *buf, const size_t len) } g_free(t); -#endif return ret; } |