X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd-nagios.c;h=b17e47e2e1618949772dd3ccfd3db592ddf643ca;hb=7c14b05db2cd7b17321f1e37bfb852c1a9a3832d;hp=271909389cfcbf716cc5d1c2270a703bd2b29c04;hpb=e30c4b09f2ba06ed279d7ddfdc3714e1b3ab3a06;p=collectd.git

diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c
index 27190938..b17e47e2 100644
--- a/src/collectd-nagios.c
+++ b/src/collectd-nagios.c
@@ -104,7 +104,7 @@ static int consolitation_g = CON_NONE;
 static _Bool nan_is_error_g = 0;
 
 static char **match_ds_g = NULL;
-static int    match_ds_num_g = 0;
+static size_t match_ds_num_g = 0;
 
 /* `strdup' is an XSI extension. I don't want to pull in all of XSI just for
  * that, so here's an own implementation.. It's easy enough. The GCC attributes
@@ -148,7 +148,7 @@ static int filter_ds (size_t *values_num,
 		return (RET_UNKNOWN);
 	}
 
-	for (i = 0; i < (size_t) match_ds_num_g; i++)
+	for (i = 0; i < match_ds_num_g; i++)
 	{
 		size_t j;
 
@@ -308,8 +308,7 @@ static int do_listval (lcc_connection_t *connection)
 
 		if ((hostname == NULL) || strcasecmp (hostname, ret_ident[i].host))
 		{
-			if (hostname != NULL)
-				free (hostname);
+			free (hostname);
 			hostname = strdup (ret_ident[i].host);
 			printf ("Host: %s\n", hostname);
 		}
@@ -323,6 +322,8 @@ static int do_listval (lcc_connection_t *connection)
 			printf ("ERROR: listval: Failed to convert returned "
 					"identifier to a string: %s\n",
 					lcc_strerror (connection));
+			free (hostname);
+			hostname = NULL;
 			continue;
 		}
 
@@ -330,8 +331,8 @@ static int do_listval (lcc_connection_t *connection)
 		printf ("\t%s\n", id + 1);
 	}
 
-	if (ret_ident != NULL)
-		free (ret_ident);
+	free (ret_ident);
+	free (hostname);
 	return (RET_OKAY);
 } /* int do_listval */