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 /wsutil | |
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 'wsutil')
-rw-r--r-- | wsutil/CMakeLists.txt | 4 | ||||
-rw-r--r-- | wsutil/wsjson.c (renamed from wsutil/wsjsmn.c) | 8 | ||||
-rw-r--r-- | wsutil/wsjson.h (renamed from wsutil/wsjsmn.h) | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index ad477791d7..7ee405a334 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -68,7 +68,7 @@ set(WSUTIL_PUBLIC_HEADERS ws_mempbrk_int.h ws_pipe.h ws_printf.h - wsjsmn.h + wsjson.h xtea.h ) @@ -116,7 +116,7 @@ set(WSUTIL_COMMON_FILES ws_mempbrk.c ws_pipe.c wsgcrypt.c - wsjsmn.c + wsjson.c xtea.c ) diff --git a/wsutil/wsjsmn.c b/wsutil/wsjson.c index 991bf667c2..675f2a6ec3 100644 --- a/wsutil/wsjsmn.c +++ b/wsutil/wsjson.c @@ -1,4 +1,4 @@ -/* wsjsmn.c +/* wsjson.c * Utility to check if a payload is json using libjsmn * * Copyright 2016, Dario Lombardo @@ -10,7 +10,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "wsjsmn.h" +#include "wsjson.h" #include <string.h> #include <wsutil/jsmn.h> @@ -58,7 +58,7 @@ gboolean jsmn_is_json(const guint8* buf, const size_t len) return ret; } -int wsjsmn_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens) +int wsjson_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens) { jsmn_parser p; @@ -66,7 +66,7 @@ int wsjsmn_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens) return jsmn_parse(&p, buf, strlen(buf), tokens, max_tokens); } -gboolean wsjsmn_unescape_json_string(const char *input, char *output) +gboolean wsjson_unescape_json_string(const char *input, char *output) { while (*input) { char ch = *input++; diff --git a/wsutil/wsjsmn.h b/wsutil/wsjson.h index 0ef21ca41e..e55f6a991d 100644 --- a/wsutil/wsjsmn.h +++ b/wsutil/wsjson.h @@ -1,4 +1,4 @@ -/* wsjsmn.h +/* wsjson.h * Utility to check if a payload is json using libjsmn * * Copyright 2016, Dario Lombardo @@ -10,8 +10,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef __WSJSMN_H__ -#define __WSJSMN_H__ +#ifndef __WSJSON_H__ +#define __WSJSON_H__ #include "ws_symbol_export.h" #include <glib.h> @@ -27,12 +27,12 @@ extern "C" { */ WS_DLL_PUBLIC gboolean jsmn_is_json(const guint8* buf, const size_t len); -WS_DLL_PUBLIC int wsjsmn_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens); +WS_DLL_PUBLIC int wsjson_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens); /** * Try to unescape input JSON string. output can be the same pointer as input, or must have the same buffer size as input. */ -WS_DLL_PUBLIC gboolean wsjsmn_unescape_json_string(const char *input, char *output); +WS_DLL_PUBLIC gboolean wsjson_unescape_json_string(const char *input, char *output); #ifdef __cplusplus } |