X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsmart.c;fp=src%2Fsmart.c;h=9395945b5bccdec64edee835d225631a50ac87ed;hb=3fb6fe5776c14f41879249f4147c0b8924b39cc1;hp=93bfcbec8aff9cc9314b254a0e821fa585a899c9;hpb=bb1d857383b85dbc2c37098391d53e2b9261c830;p=collectd.git diff --git a/src/smart.c b/src/smart.c index 93bfcbec..9395945b 100644 --- a/src/smart.c +++ b/src/smart.c @@ -70,14 +70,10 @@ static int smart_config(const char *key, const char *value) { static void smart_submit(const char *dev, const char *type, const char *type_inst, double 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; - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); sstrncpy(vl.plugin, "smart", sizeof(vl.plugin)); sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance)); sstrncpy(vl.type, type, sizeof(vl.type)); @@ -89,19 +85,20 @@ static void smart_submit(const char *dev, const char *type, 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, name, sizeof(vl.plugin_instance)); sstrncpy(vl.type, "smart_attribute", sizeof(vl.type));