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

2 files changed, 4 insertions, 4 deletions

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);