perf tool: Constify the command and option arrays

Reduce scope and capture immutability.

Signed-off-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index f475a8664ffce8c66f20c66fdfc7e85438c188db..1f51e8de6b1bb92ee019841b521440c2c07bf499 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -48,7 +48,7 @@ struct cmd_struct {
        int option;
 };
 
-static struct cmd_struct commands[] = {
+static const struct cmd_struct commands[] = {
        { "archive",    NULL,   0 },
        { "buildid-cache", cmd_buildid_cache, 0 },
        { "buildid-list", cmd_buildid_list, 0 },
@@ -178,7 +178,7 @@ static int set_debug_file(const char *path)
        return 0;
 }
 
-struct option options[] = {
+static const struct option options[] = {
        OPT_ARGUMENT("help", "help"),
        OPT_ARGUMENT("version", "version"),
        OPT_ARGUMENT("exec-path", "exec-path"),
@@ -280,7 +280,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
                        unsigned int i;
 
                        for (i = 0; i < ARRAY_SIZE(commands); i++) {
-                               struct cmd_struct *p = commands+i;
+                               const struct cmd_struct *p = commands + i;
                                printf("%s ", p->cmd);
                        }
                        putchar('\n');
@@ -289,7 +289,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
                        unsigned int i;
 
                        for (i = 0; i < ARRAY_SIZE(options)-1; i++) {
-                               struct option *p = options+i;
+                               const struct option *p = options + i;
                                printf("--%s ", p->long_name);
                        }
                        putchar('\n');
@@ -331,7 +331,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 #define RUN_SETUP      (1<<0)
 #define USE_PAGER      (1<<1)
 
-static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
+static int run_builtin(const struct cmd_struct *p, int argc, const char **argv)
 {
        int status;
        struct stat st;
@@ -390,7 +390,7 @@ static void handle_internal_command(int argc, const char **argv)
        }
 
        for (i = 0; i < ARRAY_SIZE(commands); i++) {
-               struct cmd_struct *p = commands+i;
+               const struct cmd_struct *p = commands+i;
                if (p->fn == NULL)
                        continue;
                if (strcmp(p->cmd, cmd))