X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ffhcount.c;h=93ad903e51b08c7672690c145687c9314b5433e8;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hp=4b3abff7276502efca4c9697b788a2770561ce41;hpb=88ad924df0622911c555cea6826933732e91d9cd;p=collectd.git

diff --git a/src/fhcount.c b/src/fhcount.c
index 4b3abff7..93ad903e 100644
--- a/src/fhcount.c
+++ b/src/fhcount.c
@@ -19,58 +19,47 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-
-static const char *config_keys[] = {
-  "ValuesAbsolute",
-  "ValuesPercentage"
-};
+static const char *config_keys[] = {"ValuesAbsolute", "ValuesPercentage"};
 static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
 
-static _Bool values_absolute = 1;
-static _Bool values_percentage = 0;
-
+static bool values_absolute = true;
+static bool values_percentage;
 
 static int fhcount_config(const char *key, const char *value) {
   int ret = -1;
 
   if (strcasecmp(key, "ValuesAbsolute") == 0) {
     if (IS_TRUE(value)) {
-      values_absolute = 1;
+      values_absolute = true;
     } else {
-      values_absolute = 0;
+      values_absolute = false;
     }
 
     ret = 0;
   } else if (strcasecmp(key, "ValuesPercentage") == 0) {
     if (IS_TRUE(value)) {
-      values_percentage = 1;
+      values_percentage = true;
     } else {
-      values_percentage = 0;
+      values_percentage = false;
     }
 
     ret = 0;
   }
 
-  return(ret);
+  return ret;
 }
 
-
-static void fhcount_submit(
-    const char *type, const char *type_instance, gauge_t value) {
-
-  value_t values[1];
+static void fhcount_submit(const char *type, const char *type_instance,
+                           gauge_t value) {
   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
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "fhcount", sizeof(vl.plugin));
   sstrncpy(vl.type, type, sizeof(vl.type));
   sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
@@ -79,7 +68,6 @@ static void fhcount_submit(
   plugin_dispatch_values(&vl);
 }
 
-
 static int fhcount_read(void) {
   int numfields = 0;
   int buffer_len = 60;
@@ -87,19 +75,18 @@ static int fhcount_read(void) {
   int prc_used, prc_unused;
   char *fields[3];
   char buffer[buffer_len];
-  char errbuf[1024];
   FILE *fp;
 
   // Open file
-  fp = fopen("/proc/sys/fs/file-nr" , "r");
+  fp = fopen("/proc/sys/fs/file-nr", "r");
   if (fp == NULL) {
-    ERROR("fhcount: fopen: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
-    return(EXIT_FAILURE);
+    ERROR("fhcount: fopen: %s", STRERRNO);
+    return EXIT_FAILURE;
   }
   if (fgets(buffer, buffer_len, fp) == NULL) {
-    ERROR("fhcount: fgets: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+    ERROR("fhcount: fgets: %s", STRERRNO);
     fclose(fp);
-    return(EXIT_FAILURE);
+    return EXIT_FAILURE;
   }
   fclose(fp);
 
@@ -108,33 +95,32 @@ static int fhcount_read(void) {
 
   if (numfields != 3) {
     ERROR("fhcount: Line doesn't contain 3 fields");
-    return(EXIT_FAILURE);
+    return EXIT_FAILURE;
   }
 
   // Define the values
   strtogauge(fields[0], &used);
   strtogauge(fields[1], &unused);
   strtogauge(fields[2], &max);
-  prc_used = (gauge_t) used/max*100;
-  prc_unused = (gauge_t) unused/max*100;
+  prc_used = (gauge_t)used / max * 100;
+  prc_unused = (gauge_t)unused / max * 100;
 
   // Submit values
   if (values_absolute) {
-    fhcount_submit("file_handles", "used", (gauge_t) used);
-    fhcount_submit("file_handles", "unused", (gauge_t) unused);
-    fhcount_submit("file_handles", "max", (gauge_t) max);
+    fhcount_submit("file_handles", "used", (gauge_t)used);
+    fhcount_submit("file_handles", "unused", (gauge_t)unused);
+    fhcount_submit("file_handles", "max", (gauge_t)max);
   }
   if (values_percentage) {
-    fhcount_submit("percent", "used", (gauge_t) prc_used);
-    fhcount_submit("percent", "unused", (gauge_t) prc_unused);
+    fhcount_submit("percent", "used", (gauge_t)prc_used);
+    fhcount_submit("percent", "unused", (gauge_t)prc_unused);
   }
 
-  return(0);
+  return 0;
 }
 
-
 void module_register(void) {
-  plugin_register_config(
-    "fhcount", fhcount_config, config_keys, config_keys_num);
+  plugin_register_config("fhcount", fhcount_config, config_keys,
+                         config_keys_num);
   plugin_register_read("fhcount", fhcount_read);
 }