[tip:perf/urgent] perf probe: Don' t use globals where not needed to

2012-10-05 Thread tip-bot for Arnaldo Carvalho de Melo
Commit-ID:  11c4e4a32b420db683cf58069c525e94797ce044
Gitweb: http://git.kernel.org/tip/11c4e4a32b420db683cf58069c525e94797ce044
Author: Arnaldo Carvalho de Melo 
AuthorDate: Mon, 1 Oct 2012 15:20:58 -0300
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Tue, 2 Oct 2012 18:36:37 -0300

perf probe: 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.

Cc: David Ahern 
Cc: Frederic Weisbecker 
Cc: Jiri Olsa 
Cc: Mike Galbraith 
Cc: Namhyung Kim 
Cc: Paul Mackerras 
Cc: Peter Zijlstra 
Cc: Stephane Eranian 
Link: http://lkml.kernel.org/n/tip-adql1rjwxlmahx9unvfi3...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/builtin-probe.c |   26 --
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 118aa89..de38a03 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -250,19 +250,20 @@ static int opt_set_filter(const struct option *opt 
__maybe_unused,
return 0;
 }
 
-static const char * const probe_usage[] = {
-   "perf probe [] 'PROBEDEF' ['PROBEDEF' ...]",
-   "perf probe [] --add 'PROBEDEF' [--add 'PROBEDEF' ...]",
-   "perf probe [] --del '[GROUP:]EVENT' ...",
-   "perf probe --list",
+int cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
+{
+   const char * const probe_usage[] = {
+   "perf probe [] 'PROBEDEF' ['PROBEDEF' ...]",
+   "perf probe [] --add 'PROBEDEF' [--add 'PROBEDEF' 
...]",
+   "perf probe [] --del '[GROUP:]EVENT' ...",
+   "perf probe --list",
 #ifdef DWARF_SUPPORT
-   "perf probe [] --line 'LINEDESC'",
-   "perf probe [] --vars 'PROBEPOINT'",
+   "perf probe [] --line 'LINEDESC'",
+   "perf probe [] --vars 'PROBEPOINT'",
 #endif
-   NULL
+   NULL
 };
-
-static const struct option options[] = {
+   const struct option options[] = {
OPT_INCR('v', "verbose", ,
"be more verbose (show parsed arguments, etc)"),
OPT_BOOLEAN('l', "list", _events,
@@ -325,10 +326,7 @@ static const struct option options[] = {
OPT_CALLBACK('x', "exec", NULL, "executable|path",
"target executable name or path", opt_set_target),
OPT_END()
-};
-
-int cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
-{
+   };
int ret;
 
argc = parse_options(argc, argv, options, probe_usage,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[tip:perf/urgent] perf probe: Don' t use globals where not needed to

2012-10-05 Thread tip-bot for Arnaldo Carvalho de Melo
Commit-ID:  11c4e4a32b420db683cf58069c525e94797ce044
Gitweb: http://git.kernel.org/tip/11c4e4a32b420db683cf58069c525e94797ce044
Author: Arnaldo Carvalho de Melo a...@redhat.com
AuthorDate: Mon, 1 Oct 2012 15:20:58 -0300
Committer:  Arnaldo Carvalho de Melo a...@redhat.com
CommitDate: Tue, 2 Oct 2012 18:36:37 -0300

perf probe: 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.

Cc: David Ahern dsah...@gmail.com
Cc: Frederic Weisbecker fweis...@gmail.com
Cc: Jiri Olsa jo...@redhat.com
Cc: Mike Galbraith efa...@gmx.de
Cc: Namhyung Kim namhy...@gmail.com
Cc: Paul Mackerras pau...@samba.org
Cc: Peter Zijlstra pet...@infradead.org
Cc: Stephane Eranian eran...@google.com
Link: http://lkml.kernel.org/n/tip-adql1rjwxlmahx9unvfi3...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
---
 tools/perf/builtin-probe.c |   26 --
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 118aa89..de38a03 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -250,19 +250,20 @@ static int opt_set_filter(const struct option *opt 
__maybe_unused,
return 0;
 }
 
-static const char * const probe_usage[] = {
-   perf probe [options] 'PROBEDEF' ['PROBEDEF' ...],
-   perf probe [options] --add 'PROBEDEF' [--add 'PROBEDEF' ...],
-   perf probe [options] --del '[GROUP:]EVENT' ...,
-   perf probe --list,
+int cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
+{
+   const char * const probe_usage[] = {
+   perf probe [options] 'PROBEDEF' ['PROBEDEF' ...],
+   perf probe [options] --add 'PROBEDEF' [--add 'PROBEDEF' 
...],
+   perf probe [options] --del '[GROUP:]EVENT' ...,
+   perf probe --list,
 #ifdef DWARF_SUPPORT
-   perf probe [options] --line 'LINEDESC',
-   perf probe [options] --vars 'PROBEPOINT',
+   perf probe [options] --line 'LINEDESC',
+   perf probe [options] --vars 'PROBEPOINT',
 #endif
-   NULL
+   NULL
 };
-
-static const struct option options[] = {
+   const struct option options[] = {
OPT_INCR('v', verbose, verbose,
be more verbose (show parsed arguments, etc)),
OPT_BOOLEAN('l', list, params.list_events,
@@ -325,10 +326,7 @@ static const struct option options[] = {
OPT_CALLBACK('x', exec, NULL, executable|path,
target executable name or path, opt_set_target),
OPT_END()
-};
-
-int cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
-{
+   };
int ret;
 
argc = parse_options(argc, argv, options, probe_usage,
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/