lkml.org 
[lkml]   [2023]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH v1 4/6] perf version: Use regular verbose flag
From
Remove additional version_verbose flag by using the existing verbose
variable.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-version.c | 5 ++---
tools/perf/perf.c | 2 +-
tools/perf/perf.h | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c
index 4a43043ca8ef..1872c90a6667 100644
--- a/tools/perf/builtin-version.c
+++ b/tools/perf/builtin-version.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "builtin.h"
#include "color.h"
+#include "util/debug.h"
#include "util/header.h"
#include <tools/config.h>
#include <stdbool.h>
@@ -8,8 +9,6 @@
#include <string.h>
#include <subcmd/parse-options.h>

-int version_verbose;
-
struct version {
bool build_options;
};
@@ -92,7 +91,7 @@ int cmd_version(int argc, const char **argv)

printf("perf version %s\n", perf_version_string);

- if (version.build_options || version_verbose == 1)
+ if (version.build_options || verbose > 0)
library_status();

return 0;
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 997bb9ea5ebc..441c354b8304 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -212,7 +212,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)

if (!strcmp(cmd, "-vv")) {
(*argv)[0] = "version";
- version_verbose = 1;
+ verbose = 1;
break;
}

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 20e9b93f8a39..989eb17ec474 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -18,5 +18,4 @@ enum perf_affinity {
PERF_AFFINITY_MAX
};

-extern int version_verbose;
#endif
--
2.40.0.348.gf938b09366-goog
\
 
 \ /
  Last update: 2023-03-28 03:42    [W:1.230 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site