X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fteamspeak2.c;h=a1cde320dd2cb3e9a83f9910da40beb31eefbb43;hb=f8d0e8e1ab1bf901f43398b8549c302b85979b40;hp=263863b93c8a695e002191fa70cc306d70b30fbb;hpb=f14bb45d570e0b34bdd3a2a0cadfe414c3dfda40;p=collectd.git

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 263863b9..a1cde320 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -139,7 +140,7 @@ static void tss2_submit_gauge (const char *plugin_instance,
 	if (type_instance != NULL)
 		sstrncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
-	
+
 	plugin_dispatch_values (&vl);
 } /* void tss2_submit_gauge */
 
@@ -198,9 +199,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 +215,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 +233,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,
@@ -351,7 +349,7 @@ static int tss2_receive_line (FILE *fh, char *buffer, int buffer_size)
 	 * Receive a single line from the given file object
 	 */
 	char *temp;
-	 
+
 	/*
 	 * fgets is blocking but much easier then doing anything else
 	 * TODO: Non-blocking Version would be safer
@@ -434,7 +432,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
 		char buffer[4096];
 		char *value;
 		char *endptr = NULL;
-		
+
 		status = tss2_receive_line (read_fh, buffer, sizeof (buffer));
 		if (status != 0)
 		{
@@ -445,7 +443,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
 			return (-1);
 		}
 		buffer[sizeof (buffer) - 1] = 0;
-		
+
 		if (strncmp ("average_packet_loss=", buffer,
 					strlen ("average_packet_loss=")) == 0)
 		{
@@ -461,9 +459,9 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
 				}
 				value++;
 			}
-			
+
 			value = &buffer[20];
-			
+
 			packet_loss = strtod (value, &endptr);
 			if (value == endptr)
 			{
@@ -488,7 +486,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
 					buffer);
 		}
 	}
-	
+
 	*ret_value = packet_loss;
 	return (0);
 } /* int tss2_vserver_gapl */
@@ -511,7 +509,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 +525,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
@@ -558,7 +554,7 @@ static int tss2_read_vserver (vserver_list_t *vserver)
 		char *key;
 		char *value;
 		char *endptr = NULL;
-		
+
 		/* Read one line of the server's answer */
 		status = tss2_receive_line (read_fh, buffer, sizeof (buffer));
 		if (status != 0)
@@ -723,7 +719,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;
 
@@ -753,7 +749,7 @@ static int tss2_config (const char *key, const char *value)
 	{
 		/* Server variable found */
 		int status;
-		
+
 		status = tss2_add_vserver (atoi (value));
 		if (status != 0)
 			return (1);
@@ -773,7 +769,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 +784,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)
@@ -803,10 +798,10 @@ static int tss2_read (void)
 			continue;
 		}
 	}
-	
+
 	if (success == 0)
 		return (-1);
-    return (0);
+	return (0);
 } /* int tss2_read */
 
 static int tss2_shutdown(void)
@@ -832,7 +827,7 @@ static int tss2_shutdown(void)
 	/* Get rid of the configuration */
 	sfree (config_host);
 	sfree (config_port);
-	
+
     return (0);
 } /* int tss2_shutdown */