From 5614fb77203f5ea01edfb2d739e9d4f3d570dc09 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 11 Oct 2017 17:04:29 -0600 Subject: [PATCH] Constify add_path and friends This constifies add_path, mod_path, and directory_switch. gdb/ChangeLog 2017-11-07 Tom Tromey * source.c (directory_switch, mod_path, add_path): Constify. * defs.h (add_path, mod_path, directory_switch): Constify. * mi/mi-cmd-env.c (env_mod_path): Constify. --- gdb/ChangeLog | 6 ++++++ gdb/defs.h | 6 +++--- gdb/mi/mi-cmd-env.c | 4 +--- gdb/source.c | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cf9dbc503aa..d8d956f35e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-11-07 Tom Tromey + + * source.c (directory_switch, mod_path, add_path): Constify. + * defs.h (add_path, mod_path, directory_switch): Constify. + * mi/mi-cmd-env.c (env_mod_path): Constify. + 2017-11-07 Tom Tromey * infcmd.c (strip_bg_char): Return gdb::unique_xmalloc_ptr. diff --git a/gdb/defs.h b/gdb/defs.h index cf596028571..675c239af25 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -350,11 +350,11 @@ extern int openp (const char *, int, const char *, int, char **); extern int source_full_path_of (const char *, char **); -extern void mod_path (char *, char **); +extern void mod_path (const char *, char **); -extern void add_path (char *, char **, int); +extern void add_path (const char *, char **, int); -extern void directory_switch (char *, int); +extern void directory_switch (const char *, int); extern char *source_path; diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c index 0d08bb89a93..436462ac5f4 100644 --- a/gdb/mi/mi-cmd-env.c +++ b/gdb/mi/mi-cmd-env.c @@ -32,8 +32,6 @@ #include "top.h" #include -static void env_mod_path (char *dirname, char **which_path); - static const char path_var_name[] = "PATH"; static char *orig_path = NULL; @@ -94,7 +92,7 @@ mi_cmd_env_cd (const char *command, char **argv, int argc) } static void -env_mod_path (char *dirname, char **which_path) +env_mod_path (const char *dirname, char **which_path) { if (dirname == 0 || dirname[0] == '\0') return; diff --git a/gdb/source.c b/gdb/source.c index aa672fde45e..4ae2ba251b7 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -444,7 +444,7 @@ directory_command (char *dirname, int from_tty) This will not be quoted so we must not treat spaces as separators. */ void -directory_switch (char *dirname, int from_tty) +directory_switch (const char *dirname, int from_tty) { add_path (dirname, &source_path, 0); } @@ -452,7 +452,7 @@ directory_switch (char *dirname, int from_tty) /* Add zero or more directories to the front of an arbitrary path. */ void -mod_path (char *dirname, char **which_path) +mod_path (const char *dirname, char **which_path) { add_path (dirname, which_path, 1); } @@ -464,7 +464,7 @@ mod_path (char *dirname, char **which_path) as space or tab. */ void -add_path (char *dirname, char **which_path, int parse_separators) +add_path (const char *dirname, char **which_path, int parse_separators) { char *old = *which_path; int prefix = 0; -- 2.30.2