projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
utils_format_json.c
diff --git
a/src/utils_format_json.c
b/src/utils_format_json.c
index
020d80b
..
5ca7fc8
100644
(file)
--- a/
src/utils_format_json.c
+++ b/
src/utils_format_json.c
@@
-25,6
+25,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "plugin.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
@@
-34,7
+35,6
@@
static int json_escape_string (char *buffer, size_t buffer_size, /* {{{ */
const char *string)
{
static int json_escape_string (char *buffer, size_t buffer_size, /* {{{ */
const char *string)
{
- size_t src_pos;
size_t dst_pos;
if ((buffer == NULL) || (string == NULL))
size_t dst_pos;
if ((buffer == NULL) || (string == NULL))
@@
-56,7
+56,7
@@
static int json_escape_string (char *buffer, size_t buffer_size, /* {{{ */
/* Escape special characters */
BUFFER_ADD ('"');
/* Escape special characters */
BUFFER_ADD ('"');
- for (src_pos = 0; string[src_pos] != 0; src_pos++)
+ for (s
ize_t s
rc_pos = 0; string[src_pos] != 0; src_pos++)
{
if ((string[src_pos] == '"')
|| (string[src_pos] == '\\'))
{
if ((string[src_pos] == '"')
|| (string[src_pos] == '\\'))
@@
-81,7
+81,6
@@
static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */
const data_set_t *ds, const value_list_t *vl, int store_rates)
{
size_t offset = 0;
const data_set_t *ds, const value_list_t *vl, int store_rates)
{
size_t offset = 0;
- int i;
gauge_t *rates = NULL;
memset (buffer, 0, buffer_size);
gauge_t *rates = NULL;
memset (buffer, 0, buffer_size);
@@
-105,7
+104,7
@@
static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */
} while (0)
BUFFER_ADD ("[");
} while (0)
BUFFER_ADD ("[");
- for (i = 0; i < ds->ds_num; i++)
+ for (
size_t
i = 0; i < ds->ds_num; i++)
{
if (i > 0)
BUFFER_ADD (",");
{
if (i > 0)
BUFFER_ADD (",");
@@
-160,7
+159,6
@@
static int dstypes_to_json (char *buffer, size_t buffer_size, /* {{{ */
const data_set_t *ds)
{
size_t offset = 0;
const data_set_t *ds)
{
size_t offset = 0;
- int i;
memset (buffer, 0, buffer_size);
memset (buffer, 0, buffer_size);
@@
-177,7
+175,7
@@
static int dstypes_to_json (char *buffer, size_t buffer_size, /* {{{ */
} while (0)
BUFFER_ADD ("[");
} while (0)
BUFFER_ADD ("[");
- for (i = 0; i < ds->ds_num; i++)
+ for (
size_t
i = 0; i < ds->ds_num; i++)
{
if (i > 0)
BUFFER_ADD (",");
{
if (i > 0)
BUFFER_ADD (",");
@@
-197,7
+195,6
@@
static int dsnames_to_json (char *buffer, size_t buffer_size, /* {{{ */
const data_set_t *ds)
{
size_t offset = 0;
const data_set_t *ds)
{
size_t offset = 0;
- int i;
memset (buffer, 0, buffer_size);
memset (buffer, 0, buffer_size);
@@
-214,7
+211,7
@@
static int dsnames_to_json (char *buffer, size_t buffer_size, /* {{{ */
} while (0)
BUFFER_ADD ("[");
} while (0)
BUFFER_ADD ("[");
- for (i = 0; i < ds->ds_num; i++)
+ for (
size_t
i = 0; i < ds->ds_num; i++)
{
if (i > 0)
BUFFER_ADD (",");
{
if (i > 0)
BUFFER_ADD (",");
@@
-235,7
+232,6
@@
static int meta_data_keys_to_json (char *buffer, size_t buffer_size, /* {{{ */
{
size_t offset = 0;
int status;
{
size_t offset = 0;
int status;
- size_t i;
buffer[0] = 0;
buffer[0] = 0;
@@
-250,7
+246,7
@@
static int meta_data_keys_to_json (char *buffer, size_t buffer_size, /* {{{ */
offset += ((size_t) status); \
} while (0)
offset += ((size_t) status); \
} while (0)
- for (i = 0; i < keys_num; ++i)
+ for (
size_t
i = 0; i < keys_num; ++i)
{
int type;
char *key = keys[i];
{
int type;
char *key = keys[i];
@@
-297,7
+293,7
@@
static int meta_data_keys_to_json (char *buffer, size_t buffer_size, /* {{{ */
}
} /* for (keys) */
}
} /* for (keys) */
- if (offset
<
= 0)
+ if (offset
=
= 0)
return (ENOENT);
buffer[0] = '{'; /* replace leading ',' */
return (ENOENT);
buffer[0] = '{'; /* replace leading ',' */
@@
-314,7
+310,6
@@
static int meta_data_to_json (char *buffer, size_t buffer_size, /* {{{ */
char **keys = NULL;
size_t keys_num;
int status;
char **keys = NULL;
size_t keys_num;
int status;
- size_t i;
if ((buffer == NULL) || (buffer_size == 0) || (meta == NULL))
return (EINVAL);
if ((buffer == NULL) || (buffer_size == 0) || (meta == NULL))
return (EINVAL);
@@
-326,7
+321,7
@@
static int meta_data_to_json (char *buffer, size_t buffer_size, /* {{{ */
status = meta_data_keys_to_json (buffer, buffer_size, meta, keys, keys_num);
status = meta_data_keys_to_json (buffer, buffer_size, meta, keys, keys_num);
- for (i = 0; i < keys_num; ++i)
+ for (
size_t
i = 0; i < keys_num; ++i)
sfree (keys[i]);
sfree (keys);
sfree (keys[i]);
sfree (keys);