2012-10-05 08:52:15

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: [tip:perf/urgent] perf inject: Don' t use globals where not needed to

Commit-ID: 002439e84ed67cbb33cab4057fcd6a4146c0f815
Gitweb: http://git.kernel.org/tip/002439e84ed67cbb33cab4057fcd6a4146c0f815
Author: Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 1 Oct 2012 15:20:58 -0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 2 Oct 2012 18:36:41 -0300

perf inject: Don't use globals where not needed to

Some variables were global but used in just one function, so move it to
where it belongs.

Leftover from patch at the beggining of this series.

Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/builtin-inject.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 3c9ab55..4688bea 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -242,11 +242,6 @@ static int __cmd_inject(struct perf_inject *inject)
return ret;
}

-static const char * const report_usage[] = {
- "perf inject [<options>]",
- NULL
-};
-
int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
{
struct perf_inject inject = {
@@ -273,14 +268,18 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
"be more verbose (show build ids, etc)"),
OPT_END()
};
+ const char * const inject_usage[] = {
+ "perf inject [<options>]",
+ NULL
+ };

- argc = parse_options(argc, argv, options, report_usage, 0);
+ argc = parse_options(argc, argv, options, inject_usage, 0);

/*
* Any (unrecognized) arguments left?
*/
if (argc)
- usage_with_options(report_usage, options);
+ usage_with_options(inject_usage, options);

if (symbol__init() < 0)
return -1;