projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
amqp, write_graphite and write_kafka plugins: Implement the "[Graphite]PreserveSepara...
[collectd.git]
/
src
/
apache.c
diff --git
a/src/apache.c
b/src/apache.c
index
b57d08e
..
7ccdb60
100644
(file)
--- a/
src/apache.c
+++ b/
src/apache.c
@@
-239,11
+239,6
@@
static int config_add (oconfig_item_t *ci)
if (status == 0)
{
if (status == 0)
{
- user_data_t ud = {
- .data = st,
- .free_func = apache_free
- };
-
char callback_name[3*DATA_MAX_NAME_LEN];
ssnprintf (callback_name, sizeof (callback_name),
char callback_name[3*DATA_MAX_NAME_LEN];
ssnprintf (callback_name, sizeof (callback_name),
@@
-255,7
+250,11
@@
static int config_add (oconfig_item_t *ci)
/* name = */ callback_name,
/* callback = */ apache_read_host,
/* interval = */ 0,
/* name = */ callback_name,
/* callback = */ apache_read_host,
/* interval = */ 0,
- /* user_data = */ &ud);
+ &(user_data_t) {
+ .data = st,
+ .free_func = apache_free,
+ });
+
}
if (status != 0)
}
if (status != 0)
@@
-395,8
+394,8
@@
static void submit_value (const char *type, const char *type_instance,
vl.values = &value;
vl.values_len = 1;
vl.values = &value;
vl.values_len = 1;
- sstrncpy (vl.host, (st->host != NULL) ? st->host : hostname_g,
-
sizeof (vl.host));
+ if (st->host != NULL)
+
sstrncpy (vl.host, st->host,
sizeof (vl.host));
sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
if (st->name != NULL)
sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
if (st->name != NULL)
@@
-412,19
+411,15
@@
static void submit_value (const char *type, const char *type_instance,
} /* void submit_value */
static void submit_derive (const char *type, const char *type_instance,
} /* void submit_value */
static void submit_derive (const char *type, const char *type_instance,
- derive_t
c
, apache_t *st)
+ derive_t
d
, apache_t *st)
{
{
- value_t v;
- v.derive = c;
- submit_value (type, type_instance, v, st);
+ submit_value (type, type_instance, (value_t) { .derive = d }, st);
} /* void submit_derive */
static void submit_gauge (const char *type, const char *type_instance,
gauge_t g, apache_t *st)
{
} /* void submit_derive */
static void submit_gauge (const char *type, const char *type_instance,
gauge_t g, apache_t *st)
{
- value_t v;
- v.gauge = g;
- submit_value (type, type_instance, v, st);
+ submit_value (type, type_instance, (value_t) { .gauge = g }, st);
} /* void submit_gauge */
static void submit_scoreboard (char *buf, apache_t *st)
} /* void submit_gauge */
static void submit_scoreboard (char *buf, apache_t *st)