X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fswap.c;h=9c63e9bbb56ca82a7e4ce25de7219d79aa8040d2;hb=08cf386cb8aa711ef4043d9139d464b38188a44b;hp=d714b5fcdb8d7e558eb02d1c7a787b506bc07230;hpb=43ef00c0eb99991902d3c9a5fbe582cde049b055;p=collectd.git

diff --git a/src/swap.c b/src/swap.c
index d714b5fc..9c63e9bb 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -112,9 +113,7 @@ static _Bool values_percentage = 0;
 
 static int swap_config (oconfig_item_t *ci) /* {{{ */
 {
-	int i;
-
-	for (i = 0; i < ci->children_num; i++)
+	for (int i = 0; i < ci->children_num; i++)
 	{
 		oconfig_item_t *child = ci->children + i;
 		if (strcasecmp ("ReportBytes", child->key) == 0)
@@ -509,7 +508,6 @@ static int swap_read (void) /* {{{ */
 	char *s_paths;
         int swap_num;
         int status;
-        int i;
 
         gauge_t avail = 0;
         gauge_t total = 0;
@@ -542,7 +540,7 @@ static int swap_read (void) /* {{{ */
 		sfree (s);
 		return (-1);
 	}
-        for (i = 0; i < swap_num; i++)
+        for (int i = 0; i < swap_num; i++)
 		s->swt_ent[i].ste_path = s_paths + (i * PATH_MAX);
         s->swt_n = swap_num;
 
@@ -572,7 +570,7 @@ static int swap_read (void) /* {{{ */
 		/* less elements returned than requested */
 		swap_num = status;
 
-        for (i = 0; i < swap_num; i++)
+        for (int i = 0; i < swap_num; i++)
         {
 		char path[PATH_MAX];
 		gauge_t this_total;
@@ -625,7 +623,6 @@ static int swap_read (void) /* {{{ */
 	struct swapent *swap_entries;
 	int swap_num;
 	int status;
-	int i;
 
 	gauge_t used  = 0;
 	gauge_t total = 0;
@@ -664,7 +661,7 @@ static int swap_read (void) /* {{{ */
 
 	/* TODO: Report per-device stats. The path name is available from
 	 * swap_entries[i].se_path */
-	for (i = 0; i < swap_num; i++)
+	for (int i = 0; i < swap_num; i++)
 	{
 		if ((swap_entries[i].se_flags & SWF_ENABLE) == 0)
 			continue;
@@ -677,6 +674,7 @@ static int swap_read (void) /* {{{ */
 	{
 		ERROR ("swap plugin: Total swap space (%g) is less than used swap space (%g).",
 				total, used);
+		sfree (swap_entries);
 		return (-1);
 	}
 
@@ -761,14 +759,13 @@ static int swap_read (void) /* {{{ */
 #elif HAVE_PERFSTAT
 static int swap_read (void) /* {{{ */
 {
-	perfstat_memory_total_t pmemory;
+	perfstat_memory_total_t pmemory = { 0 };
 	int status;
 
 	gauge_t total;
 	gauge_t free;
 	gauge_t reserved;
 
-	memset (&pmemory, 0, sizeof (pmemory));
         status = perfstat_memory_total (NULL, &pmemory, sizeof(perfstat_memory_total_t), 1);
 	if (status < 0)
 	{