projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1997 from rpv-tomsk/issue-1995
[collectd.git]
/
src
/
teamspeak2.c
diff --git
a/src/teamspeak2.c
b/src/teamspeak2.c
index
40ca15e
..
1bd969b
100644
(file)
--- a/
src/teamspeak2.c
+++ b/
src/teamspeak2.c
@@
-121,14
+121,10
@@
static void tss2_submit_gauge (const char *plugin_instance,
/*
* Submits a gauge value to the collectd daemon
*/
/*
* Submits a gauge value to the collectd daemon
*/
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = value;
-
- vl.values = values;
+ vl.values = &(value_t) { .gauge = value };
vl.values_len = 1;
vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
if (plugin_instance != NULL)
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
if (plugin_instance != NULL)
@@
-150,15
+146,14
@@
static void tss2_submit_io (const char *plugin_instance, const char *type,
/*
* Submits the io rx/tx tuple to the collectd daemon
*/
/*
* Submits the io rx/tx tuple to the collectd daemon
*/
- value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
-
- values[0].derive = rx;
- values[1].derive = tx;
+ value_t values[] = {
+ { .derive = rx },
+ { .derive = tx },
+ };
vl.values = values;
vl.values = values;
- vl.values_len = 2;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ vl.values_len = STATIC_ARRAY_SIZE (values);
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
if (plugin_instance != NULL)
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
if (plugin_instance != NULL)
@@
-200,7
+195,6
@@
static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
* if it's not already present
*/
struct addrinfo *ai_head;
* if it's not already present
*/
struct addrinfo *ai_head;
- struct addrinfo *ai_ptr;
int sd = -1;
int status;
int sd = -1;
int status;
@@
-234,7
+228,7
@@
static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
}
/* Try all given hosts until we can connect to one */
}
/* Try all given hosts until we can connect to one */
- for (ai_ptr = ai_head; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_head; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
/* Create socket */
sd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
{
/* Create socket */
sd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
@@
-770,7
+764,6
@@
static int tss2_read (void)
* Poll function which collects global and vserver information
* and submits it to collectd
*/
* Poll function which collects global and vserver information
* and submits it to collectd
*/
- vserver_list_t *vserver;
int success = 0;
int status;
int success = 0;
int status;
@@
-786,7
+779,7
@@
static int tss2_read (void)
}
/* Handle vservers */
}
/* Handle vservers */
- for (vserver = server_list; vserver != NULL; vserver = vserver->next)
+ for (vserver
_list_t *vserver
= server_list; vserver != NULL; vserver = vserver->next)
{
status = tss2_read_vserver (vserver);
if (status == 0)
{
status = tss2_read_vserver (vserver);
if (status == 0)