diff options
| author | Joerg Mayer <jmpt@loplof.de> | 2012-08-23 23:20:13 +0200 |
|---|---|---|
| committer | Chris E Ferron <chris.e.ferron@linux.intel.com> | 2012-08-24 09:11:48 -0700 |
| commit | 337455d6b3a13ab0be67ddcfa9d6a0ababb9cc53 (patch) | |
| tree | 51355cd1046bec624ad764f4deabad105283709f | |
| parent | 49944776ccdf98c947ceea849ad3f10a4a0b49d3 (diff) | |
Remove trailing whitespace
Signed-off-by: Joerg Mayer <jmpt@loplof.de>
| -rw-r--r-- | src/display.cpp | 2 | ||||
| -rw-r--r-- | src/display.h | 2 | ||||
| -rw-r--r-- | src/lib.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 12 | ||||
| -rw-r--r-- | src/report.cpp | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/display.cpp b/src/display.cpp index e17745d..f48b53f 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -275,7 +275,7 @@ void cursor_enter(void) void window_refresh() { class tab_window *w; - + w = tab_windows[tab_names[current_tab]]; if (w) { diff --git a/src/display.h b/src/display.h index 72f771a..33aaae1 100644 --- a/src/display.h +++ b/src/display.h @@ -60,7 +60,7 @@ public: virtual void expose(void) { cursor_pos = 0; repaint();}; virtual void hide(void) { }; - virtual ~tab_window() + virtual ~tab_window() { delwin(win); win = NULL; diff --git a/src/lib.cpp b/src/lib.cpp index 8753421..9838c0b 100644 --- a/src/lib.cpp +++ b/src/lib.cpp @@ -164,7 +164,7 @@ void write_sysfs(const string &filename, const string &value) file.open(filename.c_str(), ios::out); if (!file) return; - try + try { file << value; file.close(); diff --git a/src/main.cpp b/src/main.cpp index 7555e5c..e5b51ee 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -237,7 +237,7 @@ void report(int time, char *workload, int iterations, char *file) fprintf(stderr, _("Preparing to take measurements\n")); utf_ok = 0; one_measurement(1, NULL); - + if (!workload[0]) fprintf(stderr, _("Taking %d measurement(s) for a duration of %d second(s) each.\n"),iterations,time); else @@ -260,7 +260,7 @@ void report(int time, char *workload, int iterations, char *file) } static void checkroot() { - int uid; + int uid; uid = getuid(); if (uid != 0) { @@ -268,7 +268,7 @@ static void checkroot() { printf(_("exiting...\n")); exit(EXIT_FAILURE); } - + } static void powertop_init(void) @@ -280,7 +280,7 @@ static void powertop_init(void) if (initialized) return; - checkroot(); + checkroot(); ret = system("/sbin/modprobe cpufreq_stats > /dev/null 2>&1"); ret = system("/sbin/modprobe msr > /dev/null 2>&1"); statfs("/sys/kernel/debug", &st_fs); @@ -355,7 +355,7 @@ int main(int argc, char **argv) break; case 'e': /* Extech power analyzer support */ - checkroot(); + checkroot(); extech_power_meter(optarg ? optarg : "/dev/ttyUSB0"); break; case 'u': @@ -388,7 +388,7 @@ int main(int argc, char **argv) case 'q': freopen("/dev/null", "a", stderr); break; - + case 'C': /* csv report*/ wantreport = true; reporttype = 0; diff --git a/src/report.cpp b/src/report.cpp index af4b89b..fcb2e22 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -190,12 +190,12 @@ void init_report_output(char *filename_str, int iterations) memset(&stamp, 0, sizeof(time_t)); stamp=time(NULL); strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M%S", localtime(&stamp)); - + if (iterations != 1) - sprintf(reportout.filename, "%s-%s.%s", + sprintf(reportout.filename, "%s-%s.%s", file_prefix, datestr,file_postfix); else - sprintf(reportout.filename, "%s.%s", + sprintf(reportout.filename, "%s.%s", file_prefix, file_postfix); if (reporttype) { |