fix a bunch of compiler warnings due to careless variable naming choices

13 files changed, 61 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index 7340b60..ab91266 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 all: powertop 
 
-CFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector
+CFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector -Wshadow -Wformat
 CPPFLAGS += -Wall -O2 -g -fno-omit-frame-pointer
-CXXFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector
+CXXFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector -Wshadow -Wformat
 OBJS := lib.o main.o display.o html.o
 OBJS += cpu/cpu.o cpu/abstract_cpu.o cpu/cpu_linux.o cpu/cpu_core.o cpu/cpu_package.o cpu/intel_cpus.o  cpu/cpudevice.cpp
 OBJS += perf/perf.o perf/perf_bundle.o
diff --git a/cpu/abstract_cpu.cpp b/cpu/abstract_cpu.cpp
index 79b7076..fe4f3a0 100644
--- a/cpu/abstract_cpu.cpp
+++ b/cpu/abstract_cpu.cpp
@@ -387,12 +387,12 @@ void abstract_cpu::wiggle(void)
 uint64_t abstract_cpu::total_pstate_time(void)
 {
 	unsigned int i;
-	uint64_t total_stamp = 0;
+	uint64_t stamp = 0;
 
 	for (i = 0; i < pstates.size(); i++)
-		total_stamp += pstates[i]->time_after;
+		stamp += pstates[i]->time_after;
 
-	return total_stamp;
+	return stamp;
 }
 
 
diff --git a/cpu/cpu.h b/cpu/cpu.h
index d919482..34dcac4 100644
--- a/cpu/cpu.h
+++ b/cpu/cpu.h
@@ -96,7 +96,7 @@ public:
 	class abstract_cpu *parent;
 
 
-	void		set_number(int number, int cpu) {this->number = number; this->first_cpu = cpu;};
+	void		set_number(int _number, int cpu) {this->number = _number; this->first_cpu = cpu;};
 
 	virtual void 	measurement_start(void);
 	virtual void 	measurement_end(void);
diff --git a/devices/ahci.cpp b/devices/ahci.cpp
index 8fa68df..1c38e05 100644
--- a/devices/ahci.cpp
+++ b/devices/ahci.cpp
@@ -276,18 +276,18 @@ double ahci::power_usage(struct result_bundle *result, struct parameter_bundle *
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 	power = 0;
 
 	factor = get_parameter_value(active_index, bundle);
-	utilization = get_result_value(active_rindex, result);
-	power += utilization * factor / 100.0;
+	util = get_result_value(active_rindex, result);
+	power += util * factor / 100.0;
 
 
 	factor = get_parameter_value(partial_index, bundle);
-	utilization = get_result_value(partial_rindex, result);
-	power += utilization * factor / 100.0;
+	util = get_result_value(partial_rindex, result);
+	power += util * factor / 100.0;
 
 	return power;
 }
\ No newline at end of file
diff --git a/devices/alsa.cpp b/devices/alsa.cpp
index e476e00..55e5fb5 100644
--- a/devices/alsa.cpp
+++ b/devices/alsa.cpp
@@ -184,7 +184,7 @@ double alsa::power_usage(struct result_bundle *result, struct parameter_bundle *
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 	static int index = 0;
 
 	power = 0;
@@ -193,9 +193,9 @@ double alsa::power_usage(struct result_bundle *result, struct parameter_bundle *
 
 	factor = get_parameter_value(index, bundle);
 
-	utilization = get_result_value(rindex, result);
+	util = get_result_value(rindex, result);
 
-	power += utilization * factor / 100.0;
+	power += util * factor / 100.0;
 
 	return power;
 }
\ No newline at end of file
diff --git a/devices/backlight.cpp b/devices/backlight.cpp
index 4c41c9c..6da03d6 100644
--- a/devices/backlight.cpp
+++ b/devices/backlight.cpp
@@ -117,7 +117,7 @@ void backlight::end_measurement(void)
 	char powername[4096];
 	ifstream file;
 	double p;
-	int backlight = 0;
+	int _backlight = 0;
 
 	sprintf(filename, "%s/actual_brightness", sysfs_path);
 	file.open(filename, ios::in);
@@ -128,14 +128,14 @@ void backlight::end_measurement(void)
 
 	if (dpms_screen_on()) {
 		p = 100.0 * (end_level + start_level) / 2 / max_level;
-		backlight = 100;
+		_backlight = 100;
 	} else {
 		p = 0;
 	}
 
 	report_utilization(name, p);
 	sprintf(powername, "%s-power", name);
-	report_utilization(powername, backlight);
+	report_utilization(powername, _backlight);
 }
 
 
@@ -187,7 +187,7 @@ double backlight::power_usage(struct result_bundle *result, struct parameter_bun
 {
 	double power;
 	double factor;
-	double utilization;
+	double _utilization;
 	char powername[4096];
 	static int bl_index = 0, blp_index = 0, bl_boost_index40 = 0, bl_boost_index80, bl_boost_index100;
 
@@ -204,20 +204,20 @@ double backlight::power_usage(struct result_bundle *result, struct parameter_bun
 
 	power = 0;
 	factor = get_parameter_value(bl_index, bundle);
-	utilization = get_result_value(r_index, result);
+	_utilization = get_result_value(r_index, result);
 
-	power += utilization * factor / 100.0;
+	power += _utilization * factor / 100.0;
 
 	/*
 	 * most machines have a non-linear backlight scale. to compensate, add a fixed value
 	 * once the brightness hits 40% and 80%
 	 */
 
-	if (utilization >=99)
+	if (_utilization >=99)
 		power += get_parameter_value(bl_boost_index100, bundle);
-	else if (utilization >=80)
+	else if (_utilization >=80)
 		power += get_parameter_value(bl_boost_index80, bundle);
-	else if (utilization >=40)
+	else if (_utilization >=40)
 		power += get_parameter_value(bl_boost_index40, bundle);
 
 	factor = get_parameter_value(blp_index, bundle);
@@ -226,9 +226,9 @@ double backlight::power_usage(struct result_bundle *result, struct parameter_bun
 		sprintf(powername, "%s-power", name);
 		r_index_power = get_result_index(powername);
 	}
-	utilization = get_result_value(r_index_power, result);
+	_utilization = get_result_value(r_index_power, result);
 
-	power += utilization * factor / 100.0;
+	power += _utilization * factor / 100.0;
 
 	return power;
 }
\ No newline at end of file
diff --git a/devices/i915-gpu.cpp b/devices/i915-gpu.cpp
index 8524b1b..00ba8e9 100644
--- a/devices/i915-gpu.cpp
+++ b/devices/i915-gpu.cpp
@@ -83,12 +83,12 @@ double i915gpu::power_usage(struct result_bundle *result, struct parameter_bundl
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 	power = 0;
 	factor = get_parameter_value(index, bundle);
-	utilization = get_result_value(rindex, result);
+	util = get_result_value(rindex, result);
 
-	power += utilization * factor / 100.0;
+	power += util * factor / 100.0;
 	return power;
 }
\ No newline at end of file
diff --git a/devices/network.cpp b/devices/network.cpp
index 996feed..32e5f08 100644
--- a/devices/network.cpp
+++ b/devices/network.cpp
@@ -347,13 +347,13 @@ double network::power_usage(struct result_bundle *result, struct parameter_bundl
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 	power = 0;
 	factor = get_parameter_value(index_up, bundle);
-	utilization = get_result_value(rindex_up, result);
+	util = get_result_value(rindex_up, result);
 
-	power += utilization * factor;
+	power += util * factor;
 
 
 	if (valid_100 == -1) {
@@ -364,29 +364,29 @@ double network::power_usage(struct result_bundle *result, struct parameter_bundl
 	
 	if (valid_100 > 0) {
 		factor = get_parameter_value(index_link_100, bundle);
-		utilization = get_result_value(rindex_link_100, result);
-		power += utilization * factor / 100;
+		util = get_result_value(rindex_link_100, result);
+		power += util * factor / 100;
 	}
 
 
 	if (valid_1000 > 0) {
 		factor = get_parameter_value(index_link_1000, bundle);
-		utilization = get_result_value(rindex_link_1000, result);
-		power += utilization * factor / 100;
+		util = get_result_value(rindex_link_1000, result);
+		power += util * factor / 100;
 	}
 	
 	if (valid_high > 0) {
 		factor = get_parameter_value(index_link_high, bundle);
-		utilization = get_result_value(rindex_link_high, result);
-		power += utilization * factor / 100;
+		util = get_result_value(rindex_link_high, result);
+		power += util * factor / 100;
 	}
 
 	factor = get_parameter_value(index_pkts, bundle);
-	utilization = get_result_value(rindex_pkts, result);
-	if (utilization > 5000)
-		utilization = 5000;
+	util = get_result_value(rindex_pkts, result);
+	if (util > 5000)
+		util = 5000;
 
-	power += utilization * factor / 100;
+	power += util * factor / 100;
 
 	return power;
 }
\ No newline at end of file
diff --git a/devices/rfkill.cpp b/devices/rfkill.cpp
index eefdd5d..c3b3fbf 100644
--- a/devices/rfkill.cpp
+++ b/devices/rfkill.cpp
@@ -173,13 +173,13 @@ double rfkill::power_usage(struct result_bundle *result, struct parameter_bundle
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 	power = 0;
 	factor = get_parameter_value(index, bundle);
-	utilization = get_result_value(rindex, result);
+	util = get_result_value(rindex, result);
 
-	power += utilization * factor / 100.0;
+	power += util * factor / 100.0;
 
 	return power;
 }
\ No newline at end of file
diff --git a/devices/runtime_pm.cpp b/devices/runtime_pm.cpp
index 8a8e76d..94ab55a 100644
--- a/devices/runtime_pm.cpp
+++ b/devices/runtime_pm.cpp
@@ -125,20 +125,20 @@ double runtime_pmdevice::power_usage(struct result_bundle *result, struct parame
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 	power = 0;
 
 	factor = get_parameter_value(index, bundle);
-	utilization = get_result_value(r_index, result);
-        power += utilization * factor / 100.0;
+	util = get_result_value(r_index, result);
+        power += util * factor / 100.0;
 
 	return power;
 }
 
-void runtime_pmdevice::set_human_name(char *name)
+void runtime_pmdevice::set_human_name(char *_name)
 {
-	strcpy(humanname, name);
+	strcpy(humanname, _name);
 }
 
 
@@ -177,7 +177,6 @@ static void do_bus(const char *bus)
 	struct dirent *entry;
 	DIR *dir;
 	char filename[4096];
-	ifstream file;
 	
 	sprintf(filename, "/sys/bus/%s/devices/", bus);
 	dir = opendir(filename);
diff --git a/devices/thinkpad-fan.cpp b/devices/thinkpad-fan.cpp
index fab1766..75ce5a0 100644
--- a/devices/thinkpad-fan.cpp
+++ b/devices/thinkpad-fan.cpp
@@ -94,25 +94,25 @@ double thinkpad_fan::power_usage(struct result_bundle *result, struct parameter_
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 
 	power = 0;
-	utilization = get_result_value(r_index, result);
+	util = get_result_value(r_index, result);
 
-	if (utilization < 0)
-		utilization = 0;
+	if (util < 0)
+		util = 0;
 
 
 	/* physics dictact that fan power goes cubic with the rpms, but there's also a linear component for friction*/
 	factor = get_parameter_value(fancub_index, bundle);
-	power += factor * pow(utilization / 3600.0, 3);
+	power += factor * pow(util / 3600.0, 3);
 
 	factor = get_parameter_value(fansqr_index, bundle) - 5.0;
-	power += factor * pow(utilization / 3600.0, 2);
+	power += factor * pow(util / 3600.0, 2);
 
 	factor = get_parameter_value(fan_index, bundle) - 10.0;
-	power += utilization / 5000.0 * factor;
+	power += util / 5000.0 * factor;
 
 	if (power <= 0.0)
 		power = 0.0;
diff --git a/devices/usb.cpp b/devices/usb.cpp
index f954010..f8ef54d 100644
--- a/devices/usb.cpp
+++ b/devices/usb.cpp
@@ -170,7 +170,7 @@ double usbdevice::power_usage(struct result_bundle *result, struct parameter_bun
 {
 	double power;
 	double factor;
-	double utilization;
+	double util;
 
 	if (rootport || !cached_valid)
 		return 0.0;
@@ -178,9 +178,9 @@ double usbdevice::power_usage(struct result_bundle *result, struct parameter_bun
 
 	power = 0;
 	factor = get_parameter_value(index, bundle);
-	utilization = get_result_value(r_index, result);
+	util = get_result_value(r_index, result);
 
-	power += utilization * factor / 100.0;
+	power += util * factor / 100.0;
 
 	return power;
 }
diff --git a/perf/perf.cpp b/perf/perf.cpp
index 6322a19..0ec431e 100644
--- a/perf/perf.cpp
+++ b/perf/perf.cpp
@@ -76,7 +76,7 @@ static inline int sys_perf_event_open(struct perf_event_attr *attr,
 			group_fd, flags);
 }
 
-void perf_event::create_perf_event(char *eventname, int cpu)
+void perf_event::create_perf_event(char *eventname, int _cpu)
 {
 	struct perf_event_attr attr;
 	int ret;
@@ -112,7 +112,7 @@ void perf_event::create_perf_event(char *eventname, int cpu)
 	if (attr.config <= 0)
 		return;
 
-	perf_fd = sys_perf_event_open(&attr, -1, cpu, -1, 0);
+	perf_fd = sys_perf_event_open(&attr, -1, _cpu, -1, 0);
 
 	if (perf_fd < 0) {
 		fprintf(stderr, "PowerTOP " POWERTOP_VERSION " needs the kernel to support the 'perf' subsystem\n");