[PATCH] fix compilation error of perf/core

[PATCH] fix compilation error of perf/core

[Dong Hao]

From: Dong Hao <haodong@linux.vnet.ibm.com>

The newest branch of perf/core should have compilation error!
Error log includes:

builtin-test.c: In function ‘perf_evsel__test_field’:
builtin-test.c:1216:6: error:
 variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
builtin-test.c: In function ‘perf_evsel__tp_sched_test’:
builtin-test.c:1242:6: error:
 variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
make: *** [builtin-test.o] Error 1
---------------------------------------------------------------------
Fix it by replacing return value from 0 to ret.
Then this branch can be compiled successfully.

Signed-off-by: Dong Hao <haodong@linux.vnet.ibm.com>
---
 tools/perf/builtin-test.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 32caf13..78b47a7 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -1233,7 +1233,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
 		ret = -1;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int perf_evsel__tp_sched_test(void)
@@ -1286,7 +1286,7 @@ static int perf_evsel__tp_sched_test(void)
 	if (perf_evsel__test_field(evsel, "target_cpu", 4, true))
 		ret = -1;
 
-	return 0;
+	return ret;
 }
 
 static struct test {
-- 
1.7.2.5

Re: [PATCH] fix compilation error of perf/core

[Namhyung Kim]

Hi Dong,

On Tue, 25 Sep 2012 16:21:25 +0800, Dong Hao wrote:
> From: Dong Hao <haodong@linux.vnet.ibm.com>
>
> The newest branch of perf/core should have compilation error!
> Error log includes:
>
> builtin-test.c: In function ‘perf_evsel__test_field’:
> builtin-test.c:1216:6: error:
>  variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
> builtin-test.c: In function ‘perf_evsel__tp_sched_test’:
> builtin-test.c:1242:6: error:
>  variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
> cc1: all warnings being treated as errors
> make: *** [builtin-test.o] Error 1
> ---------------------------------------------------------------------
> Fix it by replacing return value from 0 to ret.
> Then this branch can be compiled successfully.
>
> Signed-off-by: Dong Hao <haodong@linux.vnet.ibm.com>

I already sent the same patch:

  https://lkml.org/lkml/2012/9/24/689


Thanks for fixing it anyway!
Namhyung