From 486b566fa4dce30202b0c1d680e0e537dfad4d30 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 12 Sep 2016 09:06:20 +0200 Subject: [PATCH] entropy plugin: Use parse_value_file(). --- src/entropy.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/entropy.c b/src/entropy.c index f4f4ac4a..b385c2a7 100644 --- a/src/entropy.c +++ b/src/entropy.c @@ -35,14 +35,11 @@ #define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail" -static void entropy_submit (double entropy) +static void entropy_submit (value_t value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = entropy; - - vl.values = values; + vl.values = &value; vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "entropy", sizeof (vl.plugin)); @@ -53,26 +50,14 @@ static void entropy_submit (double entropy) static int entropy_read (void) { - double entropy; - FILE *fh; - char buffer[64]; - - fh = fopen (ENTROPY_FILE, "r"); - if (fh == NULL) - return (-1); - - if (fgets (buffer, sizeof (buffer), fh) == NULL) + value_t v; + if (parse_value_file (ENTROPY_FILE, &v, DS_TYPE_GAUGE) != 0) { - fclose (fh); + ERROR ("entropy plugin: Reading \""ENTROPY_FILE"\" failed."); return (-1); } - fclose (fh); - - entropy = atof (buffer); - - if (entropy > 0.0) - entropy_submit (entropy); + entropy_submit (v); return (0); } -- 2.11.0