projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testing: Return failure from OK1() and other fixes.
[collectd.git]
/
src
/
curl_xml.c
diff --git
a/src/curl_xml.c
b/src/curl_xml.c
index
21f1b5b
..
8a466ba
100644
(file)
--- a/
src/curl_xml.c
+++ b/
src/curl_xml.c
@@
-50,7
+50,7
@@
struct cx_xpath_s /* {{{ */
char *path;
char *type;
cx_values_t *values;
char *path;
char *type;
cx_values_t *values;
-
in
t values_len;
+
size_
t values_len;
char *instance_prefix;
char *instance;
int is_table;
char *instance_prefix;
char *instance;
int is_table;
@@
-240,7
+240,7
@@
static int cx_check_type (const data_set_t *ds, cx_xpath_t *xpath) /* {{{ */
if (ds->ds_num != xpath->values_len)
{
if (ds->ds_num != xpath->values_len)
{
- WARNING ("curl_xml plugin: DataSet `%s' requires %
i values, but config talks about %i
",
+ WARNING ("curl_xml plugin: DataSet `%s' requires %
zu values, but config talks about %zu
",
xpath->type, ds->ds_num, xpath->values_len);
return (-1);
}
xpath->type, ds->ds_num, xpath->values_len);
return (-1);
}
@@
-356,7
+356,7
@@
static int cx_handle_all_value_xpaths (xmlXPathContextPtr xpath_ctx, /* {{{ */
{
value_t values[xpath->values_len];
int status;
{
value_t values[xpath->values_len];
int status;
-
in
t i;
+
size_
t i;
assert (xpath->values_len > 0);
assert (xpath->values_len == vl->values_len);
assert (xpath->values_len > 0);
assert (xpath->values_len == vl->values_len);
@@
-689,7
+689,7
@@
static int cx_config_add_values (const char *name, cx_xpath_t *xpath, /* {{{ */
xpath->values = (cx_values_t *) malloc (sizeof (cx_values_t) * ci->values_num);
if (xpath->values == NULL)
return (-1);
xpath->values = (cx_values_t *) malloc (sizeof (cx_values_t) * ci->values_num);
if (xpath->values == NULL)
return (-1);
- xpath->values_len = ci->values_num;
+ xpath->values_len =
(size_t)
ci->values_num;
/* populate cx_values_t structure */
for (i = 0; i < ci->values_num; i++)
/* populate cx_values_t structure */
for (i = 0; i < ci->values_num; i++)