X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipvs.c;h=d2ceb50bc2c8ba6685f0fa69b8d44e6bdacf552c;hb=e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9;hp=4345a46532237081bcd8ff075102e6d34635f4a7;hpb=42a7c90f4478e98dc970927cfda7ec2e1081f364;p=collectd.git

diff --git a/src/ipvs.c b/src/ipvs.c
index 4345a465..d2ceb50b 100644
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -31,6 +31,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
@@ -224,14 +225,12 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
 	return 0;
 } /* get_ti */
 
-static void cipvs_submit_connections (char *pi, char *ti, derive_t value)
+static void cipvs_submit_connections (const char *pi, const char *ti,
+		derive_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].derive = value;
-
-	vl.values     = values;
+	vl.values     = &(value_t) { .derive = value };
 	vl.values_len = 1;
 
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
@@ -245,17 +244,17 @@ static void cipvs_submit_connections (char *pi, char *ti, derive_t value)
 	return;
 } /* cipvs_submit_connections */
 
-static void cipvs_submit_if (char *pi, char *t, char *ti,
+static void cipvs_submit_if (const char *pi, const char *t, const char *ti,
 		derive_t rx, derive_t tx)
 {
-	value_t values[2];
+	value_t values[] = {
+		{ .derive = rx },
+		{ .derive = tx },
+	};
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].derive = rx;
-	values[1].derive = tx;
-
 	vl.values     = values;
-	vl.values_len = 2;
+	vl.values_len = STATIC_ARRAY_SIZE (values);
 
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
@@ -268,7 +267,8 @@ static void cipvs_submit_if (char *pi, char *t, char *ti,
 	return;
 } /* cipvs_submit_if */
 
-static void cipvs_submit_dest (char *pi, struct ip_vs_dest_entry *de) {
+static void cipvs_submit_dest (const char *pi, struct ip_vs_dest_entry *de)
+{
 	struct ip_vs_stats_user stats = de->stats;
 
 	char ti[DATA_MAX_NAME_LEN];
@@ -289,8 +289,6 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 
 	char pi[DATA_MAX_NAME_LEN];
 
-	size_t i;
-
 	if (0 != get_pi (se, pi, sizeof (pi)))
 	{
 		free (dests);
@@ -301,7 +299,7 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 	cipvs_submit_if (pi, "if_packets", NULL, stats.inpkts, stats.outpkts);
 	cipvs_submit_if (pi, "if_octets", NULL, stats.inbytes, stats.outbytes);
 
-	for (i = 0; i < dests->num_dests; ++i)
+	for (size_t i = 0; i < dests->num_dests; ++i)
 		cipvs_submit_dest (pi, &dests->entrytable[i]);
 
 	free (dests);
@@ -311,7 +309,6 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 static int cipvs_read (void)
 {
 	struct ip_vs_get_services *services = NULL;
-	size_t i;
 
 	if (sockfd < 0)
 		return (-1);
@@ -319,7 +316,7 @@ static int cipvs_read (void)
 	if (NULL == (services = ipvs_get_services ()))
 		return -1;
 
-	for (i = 0; i < services->num_services; ++i)
+	for (size_t i = 0; i < services->num_services; ++i)
 		cipvs_submit_service (&services->entrytable[i]);
 
 	free (services);