From ccdd274e761d6dcda4e532323ca609137b59e58f Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 20 Dec 2010 16:08:30 -0800
Subject: more translations

---
 TODO                      | 6 +++---
 cpu/cpu_core.cpp          | 4 ++--
 cpu/cpu_linux.cpp         | 4 ++--
 cpu/cpu_package.cpp       | 4 ++--
 parameters/persistent.cpp | 2 +-
 perf/perf.cpp             | 5 +++--
 tuning/ethernet.cpp       | 3 +--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index d75dd03..c55c72d 100644
--- a/TODO
+++ b/TODO
@@ -2,15 +2,14 @@
 
 Needed prior to alpha
 ---------------------
-
-* usage documentation / readme sufficient for people to get going
-* there is a filedescriptor leak!
 * pretty print estimate to only do 2 decimal places instead of 3
 * fix memory leaks
 
 
 Needed between alpha and 2.0 final
 ----------------------------------
+* there is a filedescriptor leak! -- or so it seems. Can't reproduce the
+  report anymore
 * investigate tick_sched_timer and why it wakes up
 * find if we can do more detailed reporting about tasklet(softirq)
 	* deal with tasklets -- needs kernel patch
@@ -35,6 +34,7 @@ postponed to 2.1
 
 done
 ----
+* usage documentation / readme sufficient for people to get going
 * internationalization!
 * on NHM, cpu P state stats accumulate and don't reset at measurment time
 * rescan for USB devices each measurement
diff --git a/cpu/cpu_core.cpp b/cpu/cpu_core.cpp
index 40b1353..d203ffc 100644
--- a/cpu/cpu_core.cpp
+++ b/cpu/cpu_core.cpp
@@ -43,7 +43,7 @@ char * cpu_core::fill_cstate_line(int line_nr, char *buffer, const char *separat
 	buffer[0] = 0;
 
 	if (line_nr == LEVEL_HEADER) {
-		sprintf(buffer,"  Core");
+		sprintf(buffer,_("  Core"));
 		return buffer;
 	}
 
@@ -187,7 +187,7 @@ char * cpu_core::fill_pstate_line(int line_nr, char *buffer)
 	}
 
 	if (line_nr == LEVEL_HEADER) {
-		sprintf(buffer,"  Core");
+		sprintf(buffer,_("  Core"));
 		return buffer;
 	}
 
diff --git a/cpu/cpu_linux.cpp b/cpu/cpu_linux.cpp
index 8b7ca6c..c8dea7e 100644
--- a/cpu/cpu_linux.cpp
+++ b/cpu/cpu_linux.cpp
@@ -228,7 +228,7 @@ char * cpu_linux::fill_cstate_line(int line_nr, char *buffer, const char *separa
 	buffer[0] = 0;
 
 	if (line_nr == LEVEL_HEADER) {
-		sprintf(buffer,"  CPU %i", number);
+		sprintf(buffer,_("  CPU %i"), number);
 		return buffer;
 	}
 
@@ -286,7 +286,7 @@ char * cpu_linux::fill_pstate_line(int line_nr, char *buffer)
 	}
 
 	if (line_nr == LEVEL_HEADER) {
-		sprintf(buffer," CPU %i", number);
+		sprintf(buffer,_(" CPU %i"), number);
 		return buffer;
 	}
 
diff --git a/cpu/cpu_package.cpp b/cpu/cpu_package.cpp
index 79f569b..7f4760a 100644
--- a/cpu/cpu_package.cpp
+++ b/cpu/cpu_package.cpp
@@ -43,7 +43,7 @@ char * cpu_package::fill_cstate_line(int line_nr, char *buffer, const char *sepa
 	buffer[0] = 0;
 
 	if (line_nr == LEVEL_HEADER) {
-		sprintf(buffer,"Package");
+		sprintf(buffer,_("Package"));
 		return buffer;
 	}
 
@@ -101,7 +101,7 @@ char * cpu_package::fill_pstate_line(int line_nr, char *buffer)
 
 
 	if (line_nr == LEVEL_HEADER) {
-		sprintf(buffer,"  Package");
+		sprintf(buffer,_("  Package"));
 		return buffer;
 	}
 
diff --git a/parameters/persistent.cpp b/parameters/persistent.cpp
index f0f557b..7fc7c0f 100644
--- a/parameters/persistent.cpp
+++ b/parameters/persistent.cpp
@@ -120,7 +120,7 @@ void save_parameters(const char *filename)
 {
 	ofstream file;
 
-	printf("result size is %i, #parameters is %i \n", (int)past_results.size(), (int)all_parameters.parameters.size());
+//	printf("result size is %i, #parameters is %i \n", (int)past_results.size(), (int)all_parameters.parameters.size());
 
 	if (!global_power_valid())
 		return;
diff --git a/perf/perf.cpp b/perf/perf.cpp
index a8b901e..1353146 100644
--- a/perf/perf.cpp
+++ b/perf/perf.cpp
@@ -43,9 +43,9 @@
 
 #include "perf.h"
 
-
 static int get_trace_type(const char *eventname)
 {
+	static int once = 0;
 	ifstream file;
 
 	int this_trace;
@@ -54,8 +54,9 @@ static int get_trace_type(const char *eventname)
 	sprintf(filename, "/sys/kernel/debug/tracing/events/%s/id", eventname);
 
 	file.open(filename, ios::in);
-	if (!file) {
+	if (!file && !once) {
 		cout << "Invalid trace type " << eventname << "\n";
+		once++;
 		return -1;
 	}
 
diff --git a/tuning/ethernet.cpp b/tuning/ethernet.cpp
index 0abd2df..907f947 100644
--- a/tuning/ethernet.cpp
+++ b/tuning/ethernet.cpp
@@ -1,4 +1,4 @@
-/*
+;/*
  * Copyright 2010, Intel Corporation
  *
  * This file is part of PowerTOP
@@ -49,7 +49,6 @@
 
 ethernet_tunable::ethernet_tunable(const char *iface) : tunable("", 0.3, "Good", "Bad", "Unknown")
 {
-	printf("iface is %s \n", iface);
 	memset(interf, 0, sizeof(interf));
 	strncpy(interf, iface, sizeof(interf));
 	sprintf(desc, "Wake-on-lan status for device %s", iface);
-- 
cgit v1.2.3