From 4d370741101aeb037ae52f3529a4a0869e0dc08a Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 12 Sep 2016 09:26:26 +0200 Subject: [PATCH] turbostat plugin: Use parse_value_file(). --- src/turbostat.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) 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 -- 2.11.0