X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils_format_json.c;h=699c74e2718706157777096598038132194bd621;hb=8aad55ab7d737a97d5927458b2b00885e27cae4d;hp=31b83c37406c49864d668bdb2930211c928ef857;hpb=e30c4b09f2ba06ed279d7ddfdc3714e1b3ab3a06;p=collectd.git diff --git a/src/utils_format_json.c b/src/utils_format_json.c index 31b83c37..699c74e2 100644 --- a/src/utils_format_json.c +++ b/src/utils_format_json.c @@ -31,7 +31,7 @@ #include "utils_cache.h" #include "utils_format_json.h" -static int escape_string (char *buffer, size_t buffer_size, /* {{{ */ +static int json_escape_string (char *buffer, size_t buffer_size, /* {{{ */ const char *string) { size_t src_pos; @@ -75,7 +75,7 @@ static int escape_string (char *buffer, size_t buffer_size, /* {{{ */ #undef BUFFER_ADD return (0); -} /* }}} int escape_string */ +} /* }}} int json_escape_string */ static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */ const data_set_t *ds, const value_list_t *vl, int store_rates) @@ -274,7 +274,7 @@ static int meta_data_to_json (char *buffer, size_t buffer_size, /* {{{ */ if (meta_data_get_string (meta, key, &value) == 0) { char temp[512] = ""; - escape_string (temp, sizeof (temp), value); + json_escape_string (temp, sizeof (temp), value); sfree (value); BUFFER_ADD (",\"%s\":%s", key, temp); } @@ -362,7 +362,7 @@ static int value_list_to_json (char *buffer, size_t buffer_size, /* {{{ */ BUFFER_ADD (",\"interval\":%.3f", CDTIME_T_TO_DOUBLE (vl->interval)); #define BUFFER_ADD_KEYVAL(key, value) do { \ - status = escape_string (temp, sizeof (temp), (value)); \ + status = json_escape_string (temp, sizeof (temp), (value)); \ if (status != 0) \ return (status); \ BUFFER_ADD (",\"%s\":%s", (key), temp); \