X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=0e58a9710c7800e974b2c415ec886c216f232235;hb=8c5927c52f4eefebaad3a6ecadc253ee9007ebb5;hp=54b3623f4b02758df80473207744b8754224fa0a;hpb=3933d0a0e2a8887b40c77ac0a92c1cac79f9b4a1;p=collectd.git

diff --git a/src/vserver.c b/src/vserver.c
index 54b3623f..0e58a971 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -55,15 +56,14 @@ static int vserver_init (void)
 static void traffic_submit (const char *plugin_instance,
 		const char *type_instance, derive_t rx, derive_t tx)
 {
-	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 = STATIC_ARRAY_SIZE (values);
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, "if_octets", sizeof (vl.type));
@@ -75,16 +75,15 @@ static void traffic_submit (const char *plugin_instance,
 static void load_submit (const char *plugin_instance,
 		gauge_t snum, gauge_t mnum, gauge_t lnum)
 {
-	value_t values[3];
 	value_list_t vl = VALUE_LIST_INIT;
-
-	values[0].gauge = snum;
-	values[1].gauge = mnum;
-	values[2].gauge = lnum;
+	value_t values[] = {
+		{ .gauge = snum },
+		{ .gauge = mnum },
+		{ .gauge = lnum },
+	};
 
 	vl.values = values;
 	vl.values_len = STATIC_ARRAY_SIZE (values);
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, "load", sizeof (vl.type));
@@ -96,14 +95,10 @@ static void submit_gauge (const char *plugin_instance, const char *type,
 		const char *type_instance, gauge_t value)
 
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = value;
-
-	vl.values = values;
-	vl.values_len = STATIC_ARRAY_SIZE (values);
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	vl.values = &(value_t) { .gauge = value };
+	vl.values_len = 1;
 	sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, type, sizeof (vl.type));
@@ -138,7 +133,7 @@ static int vserver_read (void)
 	if (proc == NULL)
 	{
 		char errbuf[1024];
-		ERROR ("vserver plugin: fopen (%s): %s", PROCDIR, 
+		ERROR ("vserver plugin: fopen (%s): %s", PROCDIR,
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
@@ -178,7 +173,7 @@ static int vserver_read (void)
 		len = ssnprintf (file, sizeof (file), PROCDIR "/%s", dent->d_name);
 		if ((len < 0) || (len >= BUFSIZE))
 			continue;
-		
+
 		status = stat (file, &statbuf);
 		if (status != 0)
 		{
@@ -187,7 +182,7 @@ static int vserver_read (void)
 					file, sstrerror (errno, errbuf, sizeof (errbuf)));
 			continue;
 		}
-		
+
 		if (!S_ISDIR (statbuf.st_mode))
 			continue;
 
@@ -208,7 +203,7 @@ static int vserver_read (void)
 		{
 			derive_t rx;
 			derive_t tx;
-			char *type_instance;
+			const char *type_instance;
 
 			if (strsplit (buffer, cols, 4) < 4)
 				continue;
@@ -258,7 +253,7 @@ static int vserver_read (void)
 
 			if (2 == n)
 			{
-				char   *type_instance;
+				const char *type_instance;
 				gauge_t value;
 
 				if (0 == strcmp (cols[0], "nr_threads:"))
@@ -307,8 +302,8 @@ static int vserver_read (void)
 
 		while ((fh != NULL) && (NULL != fgets (buffer, BUFSIZE, fh)))
 		{
-			char *type = "vs_memory";
-			char *type_instance;
+			const char *type = "vs_memory";
+			const char *type_instance;
 			gauge_t value;
 
 			if (strsplit (buffer, cols, 2) < 2)