summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2013-08-20 17:20:15 -0700
committerLen Brown <len.brown@intel.com>2014-01-18 22:34:09 -0500
commit74823419761c11830ea1819365f82cf3d48795cb (patch)
treeac323646d9af59a412b2e8bdf981dd803b806faf
parent2b92865e648ce04a39fda4f903784a5d01ecb0dc (diff)
downloadlinux-74823419761c11830ea1819365f82cf3d48795cb.tar.gz
linux-74823419761c11830ea1819365f82cf3d48795cb.tar.bz2
linux-74823419761c11830ea1819365f82cf3d48795cb.zip
turbostat: Check return value of fscanf
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 <josh@joshtriplett.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--tools/power/x86/turbostat/turbostat.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 51741a1b7021..4f7b88b035c3 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1189,7 +1189,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);
}
@@ -1210,7 +1213,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);
}
@@ -1227,7 +1233,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;
}
@@ -1244,7 +1253,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;
}