projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_prometheus plugin: Use the "static" macro to specify PROMETHEUS_DEFAULT_STALENE...
[collectd.git]
/
src
/
netapp.c
diff --git
a/src/netapp.c
b/src/netapp.c
index
f238a6d
..
c532062
100644
(file)
--- a/
src/netapp.c
+++ b/
src/netapp.c
@@
-633,8
+633,6
@@
static int submit_values (const char *host, /* {{{ */
if (host != NULL)
sstrncpy (vl.host, host, sizeof (vl.host));
if (host != NULL)
sstrncpy (vl.host, host, sizeof (vl.host));
- else
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "netapp", sizeof (vl.plugin));
if (plugin_inst != NULL)
sstrncpy (vl.plugin_instance, plugin_inst, sizeof (vl.plugin_instance));
sstrncpy (vl.plugin, "netapp", sizeof (vl.plugin));
if (plugin_inst != NULL)
sstrncpy (vl.plugin_instance, plugin_inst, sizeof (vl.plugin_instance));
@@
-649,13
+647,13
@@
static int submit_two_derive (const char *host, const char *plugin_inst, /* {{{
const char *type, const char *type_inst, derive_t val0, derive_t val1,
cdtime_t timestamp, cdtime_t interval)
{
const char *type, const char *type_inst, derive_t val0, derive_t val1,
cdtime_t timestamp, cdtime_t interval)
{
- value_t values[
2];
-
- values[0].derive = val0;
-
values[1].derive = val1
;
+ value_t values[
] = {
+ { .derive = val0 },
+ { .derive = val1 },
+
}
;
return (submit_values (host, plugin_inst, type, type_inst,
return (submit_values (host, plugin_inst, type, type_inst,
- values,
2
, timestamp, interval));
+ values,
STATIC_ARRAY_SIZE (values)
, timestamp, interval));
} /* }}} int submit_two_derive */
static int submit_derive (const char *host, const char *plugin_inst, /* {{{ */
} /* }}} int submit_two_derive */
static int submit_derive (const char *host, const char *plugin_inst, /* {{{ */
@@
-670,13
+668,13
@@
static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ *
const char *type, const char *type_inst, gauge_t val0, gauge_t val1,
cdtime_t timestamp, cdtime_t interval)
{
const char *type, const char *type_inst, gauge_t val0, gauge_t val1,
cdtime_t timestamp, cdtime_t interval)
{
- value_t values[
2];
-
- values[0].gauge = val0;
-
values[1].gauge = val1
;
+ value_t values[
] = {
+ { .gauge = val0 },
+ { .gauge = val1 },
+
}
;
return (submit_values (host, plugin_inst, type, type_inst,
return (submit_values (host, plugin_inst, type, type_inst,
- values,
2
, timestamp, interval));
+ values,
STATIC_ARRAY_SIZE (values)
, timestamp, interval));
} /* }}} int submit_two_gauge */
static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
} /* }}} int submit_two_gauge */
static int submit_double (const char *host, const char *plugin_inst, /* {{{ */