diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-04-20 16:55:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-21 07:13:31 +0000 |
| commit | 57fee051c6a37ab152d303be4d156c8e5c64b36a (patch) | |
| tree | 68bc4d1d14e3a1cb4ce738018cabb2a83febe696 /sharkd_session.c | |
| parent | 119a497652d2436824a733c0c853dbdc80aaf9eb (diff) | |
wsutil: rename wsjsmn to wsjson.
This puts more distance between the caller and the underlying
library. At the moment we're using libjsmn, but other libraries
(like json-glib) could be used.
Change-Id: I1431424a998fc8188ad47b71d6d95afdc92a3f9e
Reviewed-on: https://code.wireshark.org/review/27055
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'sharkd_session.c')
| -rw-r--r-- | sharkd_session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sharkd_session.c b/sharkd_session.c index 2c2f9262c9..bffacf4b3e 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -18,7 +18,7 @@ #include <glib.h> -#include <wsutil/wsjsmn.h> +#include <wsutil/wsjson.h> #include <wsutil/ws_printf.h> #include <file.h> @@ -79,7 +79,7 @@ static GHashTable *filter_table = NULL; static gboolean json_unescape_str(char *input) { - return wsjsmn_unescape_json_string(input, input); + return wsjson_unescape_json_string(input, input); } static const char * @@ -4008,7 +4008,7 @@ sharkd_session_main(void) /* every command is line seperated JSON */ int ret; - ret = wsjsmn_parse(buf, NULL, 0); + ret = wsjson_parse(buf, NULL, 0); if (ret < 0) { fprintf(stderr, "invalid JSON -> closing\n"); @@ -4026,7 +4026,7 @@ sharkd_session_main(void) memset(tokens, 0, ret * sizeof(jsmntok_t)); - ret = wsjsmn_parse(buf, tokens, ret); + ret = wsjson_parse(buf, tokens, ret); if (ret < 0) { fprintf(stderr, "invalid JSON(2) -> closing\n"); |