X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipvs.c;h=92690e88e0098635a8cc56fe9c6191116b81082e;hb=5523a080010dcb7a61dc0dccc3969a2a048e52f9;hp=4345a46532237081bcd8ff075102e6d34635f4a7;hpb=042c592bcddeea04cf81230ba9c97a09c5d3595c;p=collectd.git diff --git a/src/ipvs.c b/src/ipvs.c index 4345a465..92690e88 100644 --- a/src/ipvs.c +++ b/src/ipvs.c @@ -31,6 +31,7 @@ */ #include "collectd.h" + #include "plugin.h" #include "common.h" @@ -224,7 +225,8 @@ 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; @@ -245,7 +247,7 @@ 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]; @@ -268,7 +270,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 +292,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 +302,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 +312,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 +319,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);