X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fteamspeak2.c;h=1bd969bd9e158dcbf6d7bb92c5fd9e68f70ce599;hb=ec43e8a33bdcb116e75310c7bd9daae3bc912834;hp=41f58e5c617fb1eab68f7f07067ee242a4320ddc;hpb=3dc0454f7bee3e852171d1f6944891693364ee01;p=collectd.git

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 41f58e5c..1bd969bd 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -120,14 +121,10 @@ static void tss2_submit_gauge (const char *plugin_instance,
 	/*
 	 * Submits a gauge value to the collectd daemon
 	 */
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = value;
-
-	vl.values     = values;
+	vl.values     = &(value_t) { .gauge = value };
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
 
 	if (plugin_instance != NULL)
@@ -149,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
 	 */
-	value_t values[2];
 	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_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)
@@ -198,9 +194,7 @@ static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
 	 * Returns connected file objects or establishes the connection
 	 * if it's not already present
 	 */
-	struct addrinfo ai_hints;
 	struct addrinfo *ai_head;
-	struct addrinfo *ai_ptr;
 	int sd = -1;
 	int status;
 
@@ -216,12 +210,11 @@ static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
 	}
 
 	/* Get all addrs for this hostname */
-	memset (&ai_hints, 0, sizeof (ai_hints));
-#ifdef AI_ADDRCONFIG
-	ai_hints.ai_flags |= AI_ADDRCONFIG;
-#endif
-	ai_hints.ai_family = AF_UNSPEC;
-	ai_hints.ai_socktype = SOCK_STREAM;
+	struct addrinfo ai_hints = {
+		.ai_family = AF_UNSPEC,
+		.ai_flags = AI_ADDRCONFIG,
+		.ai_socktype = SOCK_STREAM
+	};
 
 	status = getaddrinfo ((config_host != NULL) ? config_host : DEFAULT_HOST,
 			(config_port != NULL) ? config_port : DEFAULT_PORT,
@@ -235,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 */
-	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,
@@ -511,7 +504,7 @@ static int tss2_read_vserver (vserver_list_t *vserver)
 	gauge_t packet_loss = NAN;
 	int valid = 0;
 
-	char plugin_instance[DATA_MAX_NAME_LEN];
+	char plugin_instance[DATA_MAX_NAME_LEN] = { 0 };
 
 	FILE *read_fh;
 	FILE *write_fh;
@@ -527,8 +520,6 @@ static int tss2_read_vserver (vserver_list_t *vserver)
 	if (vserver == NULL)
 	{
 		/* Request global information */
-		memset (plugin_instance, 0, sizeof (plugin_instance));
-
 		status = tss2_send_request (write_fh, "gi\r\n");
 	}
 	else
@@ -723,7 +714,7 @@ static int tss2_config (const char *key, const char *value)
 	/*
 	 * Interpret configuration values
 	 */
-    if (strcasecmp ("Host", key) == 0)
+	if (strcasecmp ("Host", key) == 0)
 	{
 		char *temp;
 
@@ -773,7 +764,6 @@ static int tss2_read (void)
 	 * Poll function which collects global and vserver information
 	 * and submits it to collectd
 	 */
-	vserver_list_t *vserver;
 	int success = 0;
 	int status;
 
@@ -789,7 +779,7 @@ static int tss2_read (void)
 	}
 
 	/* 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)
@@ -806,7 +796,7 @@ static int tss2_read (void)
 
 	if (success == 0)
 		return (-1);
-    return (0);
+	return (0);
 } /* int tss2_read */
 
 static int tss2_shutdown(void)