Grigorii Nazarov <whitecrow...@gmail.com> writes:
> Signed-off-by: Grigorii Nazarov <whitecrow...@gmail.com>
> ---
There's only one user left in tree. Maybe it makes sense to remove
this? Or at least mark it deprecated or something? It is used quite a
bit in OVN project. It doesn't seem like it is worth the overhead of
the extra function call in OVS, though. At the very least, maybe it can
become an inline function in the json.h file.
> lib/json.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/lib/json.c b/lib/json.c
> index 001f6e6ab..d40e93857 100644
> --- a/lib/json.c
> +++ b/lib/json.c
> @@ -127,7 +127,9 @@ static void json_parser_input(struct json_parser *,
> struct json_token *);
>
> static void json_error(struct json_parser *p, const char *format, ...)
> OVS_PRINTF_FORMAT(2, 3);
> -
> +
> +static void json_serialize_string(const char *, struct ds *);
> +
> const char *
> json_type_to_string(enum json_type type)
> {
> @@ -987,11 +989,7 @@ exit:
> void
> json_string_escape(const char *in, struct ds *out)
> {
> - struct json json = {
> - .type = JSON_STRING,
> - .string = CONST_CAST(char *, in),
> - };
> - json_to_ds(&json, 0, out);
> + json_serialize_string(in, out);
> }
>
> static void
> @@ -1572,7 +1570,6 @@ static void json_serialize_object(const struct shash
> *object,
> struct json_serializer *);
> static void json_serialize_array(const struct json_array *,
> struct json_serializer *);
> -static void json_serialize_string(const char *, struct ds *);
>
> /* Converts 'json' to a string in JSON format, encoded in UTF-8, and returns
> * that string. The caller is responsible for freeing the returned string,
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
