X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ffhcount.c;h=a2f5aa8c9aabf87dc8623b2b9ac99a9023cb84ae;hb=10139cda6f68ae1f921d79c930dd85944afb74a3;hp=4c409b58d894f20ed8544a2df964b379ced000ed;hpb=649eff4e6f96ba72d693c1442acaa62abdf965e0;p=collectd.git

diff --git a/src/fhcount.c b/src/fhcount.c
index 4c409b58..a2f5aa8c 100644
--- a/src/fhcount.c
+++ b/src/fhcount.c
@@ -18,9 +18,9 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 
 static const char *config_keys[] = {
@@ -60,13 +60,9 @@ static int fhcount_config(const char *key, const char *value) {
 
 static void fhcount_submit(
     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 = &(value_t) { .gauge = value };
   vl.values_len = 1;
 
   // Compose the metric
@@ -79,7 +75,6 @@ static void fhcount_submit(
   plugin_dispatch_values(&vl);
 }
 
-
 static int fhcount_read(void) {
   int numfields = 0;
   int buffer_len = 60;
@@ -98,6 +93,7 @@ static int fhcount_read(void) {
   }
   if (fgets(buffer, buffer_len, fp) == NULL) {
     ERROR("fhcount: fgets: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+    fclose(fp);
     return(EXIT_FAILURE);
   }
   fclose(fp);