[PATCH v2 4/8] turbostat: Check return value of fscanf

[Josh Triplett]

Some systems declare fscanf with the warn_unused_result attribute.  On
such systems, turbostat generates the following warnings:

turbostat.c: In function 'get_core_id':
turbostat.c:1203:8: warning: ignoring return value of 'fscanf', declared with 
attribute warn_unused_result [-Wunused-result]
turbostat.c: In function 'get_physical_package_id':
turbostat.c:1186:8: warning: ignoring return value of 'fscanf', declared with 
attribute warn_unused_result [-Wunused-result]
turbostat.c: In function 'cpu_is_first_core_in_package':
turbostat.c:1169:8: warning: ignoring return value of 'fscanf', declared with 
attribute warn_unused_result [-Wunused-result]
turbostat.c: In function 'cpu_is_first_sibling_in_core':
turbostat.c:1148:8: warning: ignoring return value of 'fscanf', declared with 
attribute warn_unused_result [-Wunused-result]

Fix these by checking the return value of those four calls to fscanf.

Signed-off-by: Josh Triplett <j...@joshtriplett.org>
---
 tools/power/x86/turbostat/turbostat.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tools/power/x86/turbostat/turbostat.c 
b/tools/power/x86/turbostat/turbostat.c
index dc30f1b..514adba 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1167,7 +1167,10 @@ int cpu_is_first_sibling_in_core(int cpu)
                perror(path);
                exit(1);
        }
-       fscanf(filep, "%d", &first_cpu);
+       if (fscanf(filep, "%d", &first_cpu) != 1) {
+               perror(path);
+               exit(1);
+       }
        fclose(filep);
        return (cpu == first_cpu);
 }
@@ -1188,7 +1191,10 @@ int cpu_is_first_core_in_package(int cpu)
                perror(path);
                exit(1);
        }
-       fscanf(filep, "%d", &first_cpu);
+       if (fscanf(filep, "%d", &first_cpu) != 1) {
+               perror(path);
+               exit(1);
+       }
        fclose(filep);
        return (cpu == first_cpu);
 }
@@ -1205,7 +1211,10 @@ int get_physical_package_id(int cpu)
                perror(path);
                exit(1);
        }
-       fscanf(filep, "%d", &pkg);
+       if (fscanf(filep, "%d", &pkg) != 1) {
+               perror(path);
+               exit(1);
+       }
        fclose(filep);
        return pkg;
 }
@@ -1222,7 +1231,10 @@ int get_core_id(int cpu)
                perror(path);
                exit(1);
        }
-       fscanf(filep, "%d", &core);
+       if (fscanf(filep, "%d", &core) != 1) {
+               perror(path);
+               exit(1);
+       }
        fclose(filep);
        return core;
 }
-- 
1.8.4.rc3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/