From: Florian Forster <octo@collectd.org>
Date: Mon, 12 Sep 2016 07:26:26 +0000 (+0200)
Subject: turbostat plugin: Use parse_value_file().
X-Git-Tag: collectd-5.7.0~98^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4d370741101aeb037ae52f3529a4a0869e0dc08a;p=collectd.git

turbostat plugin: Use parse_value_file().
---

diff --git a/src/turbostat.c b/src/turbostat.c
index 2d8a08e6..7b813c9f 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -1018,8 +1018,7 @@ parse_int_file(const char *fmt, ...)
 {
 	va_list args;
 	char path[PATH_MAX];
-	FILE *filep;
-	int len, value;
+	int len;
 
 	va_start(args, fmt);
 	len = vsnprintf(path, sizeof(path), fmt, args);
@@ -1029,18 +1028,13 @@ parse_int_file(const char *fmt, ...)
 		return -1;
 	}
 
-	filep = fopen(path, "r");
-	if (!filep) {
-		ERROR("turbostat plugin: Failed to open '%s'", path);
-		return -1;
-	}
-	if (fscanf(filep, "%d", &value) != 1) {
-		ERROR("turbostat plugin: Failed to parse number from '%s'", path);
-		fclose(filep);
+	value_t v;
+	if (parse_value_file (path, &v, DS_TYPE_DERIVE) != 0) {
+		ERROR ("turbostat plugin: Parsing \"%s\" failed.", path);
 		return -1;
 	}
-	fclose(filep);
-	return value;
+
+	return (int) v.derive;
 }
 
 static int