From: Florian Forster <octo@collectd.org>
Date: Thu, 8 Dec 2016 14:27:03 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.0~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3fb6fe5776c14f41879249f4147c0b8924b39cc1;p=collectd.git

Merge branch 'collectd-5.6' into collectd-5.7
---

3fb6fe5776c14f41879249f4147c0b8924b39cc1
diff --cc src/smart.c
index 373839e1,93bfcbec..9395945b
--- a/src/smart.c
+++ b/src/smart.c
@@@ -82,26 -86,24 +82,25 @@@ static void smart_submit(const char *de
    plugin_dispatch_values(&vl);
  }
  
- static void smart_handle_disk_attribute(SkDisk *d,
-                                         const SkSmartAttributeParsedData *a,
-                                         void *userdata) {
-   const char *dev = userdata;
+ static void handle_attribute(SkDisk *d, const SkSmartAttributeParsedData *a,
+                              void *userdata) {
+   char const *name = userdata;
 -  value_t values[4];
 -  value_list_t vl = VALUE_LIST_INIT;
  
    if (!a->current_value_valid || !a->worst_value_valid)
      return;
 -  values[0].gauge = a->current_value;
 -  values[1].gauge = a->worst_value;
 -  values[2].gauge = a->threshold_valid ? a->threshold : 0;
 -  values[3].gauge = a->pretty_value;
 +
 +  value_list_t vl = VALUE_LIST_INIT;
 +  value_t values[] = {
 +      {.gauge = a->current_value},
 +      {.gauge = a->worst_value},
 +      {.gauge = a->threshold_valid ? a->threshold : 0},
 +      {.gauge = a->pretty_value},
 +  };
  
    vl.values = values;
 -  vl.values_len = 4;
 -  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
 +  vl.values_len = STATIC_ARRAY_SIZE(values);
    sstrncpy(vl.plugin, "smart", sizeof(vl.plugin));
-   sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance));
+   sstrncpy(vl.plugin_instance, name, sizeof(vl.plugin_instance));
    sstrncpy(vl.type, "smart_attribute", sizeof(vl.type));
    sstrncpy(vl.type_instance, a->name, sizeof(vl.type_instance));