Merge remote-tracking branch 'origin/collectd-5.8'

[collectd.git] / src / vmem.c

diff --git a/src/vmem.c b/src/vmem.c
index 60ea382..95cfbaf 100644 (file)
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -47,7 +47,6 @@ static void submit(const char *plugin_instance, const char *type,
   vl.values = values;
   vl.values_len = values_len;
 
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "vmem", sizeof(vl.plugin));
   if (plugin_instance != NULL)
     sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance));
@@ -60,12 +59,12 @@ static void submit(const char *plugin_instance, const char *type,
 
 static void submit_two(const char *plugin_instance, const char *type,
                        const char *type_instance, derive_t c0, derive_t c1) {
-  value_t values[2];
+  value_t values[] = {
+      {.derive = c0}, {.derive = c1},
+  };
 
-  values[0].derive = c0;
-  values[1].derive = c1;
-
-  submit(plugin_instance, type, type_instance, values, 2);
+  submit(plugin_instance, type, type_instance, values,
+         STATIC_ARRAY_SIZE(values));
 } /* void submit_one */
 
 static void submit_one(const char *plugin_instance, const char *type,
@@ -80,10 +79,10 @@ static int vmem_config(const char *key, const char *value) {
     else
       verbose_output = 0;
   } else {
-    return (-1);
+    return -1;
   }
 
-  return (0);
+  return 0;
 } /* int vmem_config */
 
 static int vmem_read(void) {
@@ -105,10 +104,8 @@ static int vmem_read(void) {
 
   fh = fopen("/proc/vmstat", "r");
   if (fh == NULL) {
-    char errbuf[1024];
-    ERROR("vmem plugin: fopen (/proc/vmstat) failed: %s",
-          sstrerror(errno, errbuf, sizeof(errbuf)));
-    return (-1);
+    ERROR("vmem plugin: fopen (/proc/vmstat) failed: %s", STRERRNO);
+    return -1;
   }
 
   while (fgets(buffer, sizeof(buffer), fh) != NULL) {
@@ -254,12 +251,10 @@ static int vmem_read(void) {
     submit_two(NULL, "vmpage_io", "swap", pswpin, pswpout);
 #endif /* KERNEL_LINUX */
 
-  return (0);
+  return 0;
 } /* int vmem_read */
 
 void module_register(void) {
   plugin_register_config("vmem", vmem_config, config_keys, config_keys_num);
   plugin_register_read("vmem", vmem_read);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 : */