From 995816ba55d952b2823d2ead66495c5cad6dfe58 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 5 Apr 2017 19:21:37 +0100 Subject: [PATCH] -Wwrite-strings: More Solaris Some obvious constifications found by attempting to build 64-bit GDB on Solaris 11. gdb/ChangeLog: 2017-04-05 Pedro Alves * proc-api.c (struct trans): Constify. (procfs_note): Constify. * proc-events.c (struct trans, syscall_table): * proc-flags.c (struct trans): Constify. * proc-utils.h (procfs_note): Constify. * proc-why.c (struct trans): Constify. * procfs.c (dead_procinfo, find_syscall, proc_warn, proc_error) (procfs_detach): Constify. * sol-thread.c (struct string_map): Constify. (td_err_string, td_state_string): Constify. --- gdb/ChangeLog | 13 +++++++++++++ gdb/proc-api.c | 6 +++--- gdb/proc-events.c | 6 +++--- gdb/proc-flags.c | 4 ++-- gdb/proc-utils.h | 2 +- gdb/proc-why.c | 4 ++-- gdb/procfs.c | 20 ++++++++++---------- gdb/sol-thread.c | 6 +++--- 8 files changed, 37 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f4e9562fb2..3a40ad9c86 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2017-04-05 Pedro Alves + + * proc-api.c (struct trans): Constify. + (procfs_note): Constify. + * proc-events.c (struct trans, syscall_table): + * proc-flags.c (struct trans): Constify. + * proc-utils.h (procfs_note): Constify. + * proc-why.c (struct trans): Constify. + * procfs.c (dead_procinfo, find_syscall, proc_warn, proc_error) + (procfs_detach): Constify. + * sol-thread.c (struct string_map): Constify. + (td_err_string, td_state_string): Constify. + 2017-04-05 Pedro Alves * proc-api.c (procfs_filename): Don't initialize diff --git a/gdb/proc-api.c b/gdb/proc-api.c index dbadd552bf..dd9af0d723 100644 --- a/gdb/proc-api.c +++ b/gdb/proc-api.c @@ -54,8 +54,8 @@ struct trans { long value; /* The numeric value */ - char *name; /* The equivalent symbolic value */ - char *desc; /* Short description of value */ + const char *name; /* The equivalent symbolic value */ + const char *desc; /* Short description of value */ }; static int procfs_trace = 0; @@ -733,7 +733,7 @@ wait_with_trace (int *wstat, char *file, int line) } void -procfs_note (char *msg, char *file, int line) +procfs_note (const char *msg, const char *file, int line) { prepare_to_trace (); if (procfs_trace) diff --git a/gdb/proc-events.c b/gdb/proc-events.c index 2353682103..961d626113 100644 --- a/gdb/proc-events.c +++ b/gdb/proc-events.c @@ -54,8 +54,8 @@ struct trans { int value; /* The numeric value. */ - char *name; /* The equivalent symbolic value. */ - char *desc; /* Short description of value. */ + const char *name; /* The equivalent symbolic value. */ + const char *desc; /* Short description of value. */ }; @@ -64,7 +64,7 @@ struct trans /* Syscall translation table. */ #define MAX_SYSCALLS 262 /* Pretty arbitrary. */ -static char *syscall_table[MAX_SYSCALLS]; +static const char *syscall_table[MAX_SYSCALLS]; static void init_syscall_table (void) diff --git a/gdb/proc-flags.c b/gdb/proc-flags.c index fba91d1eed..29b5f2aa38 100644 --- a/gdb/proc-flags.c +++ b/gdb/proc-flags.c @@ -43,8 +43,8 @@ struct trans { int value; /* The numeric value */ - char *name; /* The equivalent symbolic value */ - char *desc; /* Short description of value */ + const char *name; /* The equivalent symbolic value */ + const char *desc; /* Short description of value */ }; /* Translate bits in the pr_flags member of the prstatus structure, diff --git a/gdb/proc-utils.h b/gdb/proc-utils.h index d481041ec2..5ece8eea23 100644 --- a/gdb/proc-utils.h +++ b/gdb/proc-utils.h @@ -88,7 +88,7 @@ extern int ioctl_with_trace (int, long, void *, char *, int); extern pid_t wait_with_trace (int *, char *, int); extern int open_with_trace (char *, int, char *, int); extern int close_with_trace (int, char *, int); -extern void procfs_note (char *, char *, int); +extern void procfs_note (const char *, const char *, int); #ifdef PROCFS_TRACE /* diff --git a/gdb/proc-why.c b/gdb/proc-why.c index def84723cc..9c606357b9 100644 --- a/gdb/proc-why.c +++ b/gdb/proc-why.c @@ -38,8 +38,8 @@ struct trans { int value; /* The numeric value. */ - char *name; /* The equivalent symbolic value. */ - char *desc; /* Short description of value. */ + const char *name; /* The equivalent symbolic value. */ + const char *desc; /* Short description of value. */ }; /* Translate values in the pr_why field of a `struct prstatus' or diff --git a/gdb/procfs.c b/gdb/procfs.c index 71d4b643d9..87c317f375 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -421,7 +421,7 @@ static procinfo *find_procinfo (int pid, int tid); static procinfo *create_procinfo (int pid, int tid); static void destroy_procinfo (procinfo * p); static void do_destroy_procinfo_cleanup (void *); -static void dead_procinfo (procinfo * p, char *msg, int killp); +static void dead_procinfo (procinfo * p, const char *msg, int killp); static int open_procinfo_files (procinfo * p, int which); static void close_procinfo_files (procinfo * p); static int sysset_t_size (procinfo *p); @@ -429,7 +429,7 @@ static sysset_t *sysset_t_alloc (procinfo * pi); #ifdef DYNAMIC_SYSCALLS static void load_syscalls (procinfo *pi); static void free_syscalls (procinfo *pi); -static int find_syscall (procinfo *pi, char *name); +static int find_syscall (procinfo *pi, const char *name); #endif /* DYNAMIC_SYSCALLS */ static int iterate_over_mappings @@ -801,7 +801,7 @@ enum { NOKILL, KILL }; destroys the data structure. */ static void -dead_procinfo (procinfo *pi, char *msg, int kill_p) +dead_procinfo (procinfo *pi, const char *msg, int kill_p) { char procfile[80]; @@ -982,7 +982,7 @@ free_syscalls (procinfo *pi) If no match is found, return -1. */ static int -find_syscall (procinfo *pi, char *name) +find_syscall (procinfo *pi, const char *name) { int i; @@ -1020,14 +1020,14 @@ static int proc_iterate_over_threads void *ptr); static void -proc_warn (procinfo *pi, char *func, int line) +proc_warn (procinfo *pi, const char *func, int line) { sprintf (errmsg, "procfs: %s line %d, %s", func, line, pi->pathname); print_sys_errmsg (errmsg, errno); } static void -proc_error (procinfo *pi, char *func, int line) +proc_error (procinfo *pi, const char *func, int line) { sprintf (errmsg, "procfs: %s line %d, %s", func, line, pi->pathname); perror_with_name (errmsg); @@ -3066,7 +3066,7 @@ procfs_detach (struct target_ops *ops, const char *args, int from_tty) if (from_tty) { - char *exec_file; + const char *exec_file; exec_file = get_exec_file (0); if (exec_file == NULL) @@ -4557,11 +4557,11 @@ procfs_create_inferior (struct target_ops *ops, char *exec_file, if the caller is the superuser; failing to use it loses if there are ACLs or some such. */ - char *p; - char *p1; + const char *p; + const char *p1; /* FIXME-maybe: might want "set path" command so user can change what path is used from within GDB. */ - char *path = getenv ("PATH"); + const char *path = getenv ("PATH"); int len; struct stat statbuf; diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 39dae864a3..02515b2a4e 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -86,7 +86,7 @@ struct ps_prochandle struct string_map { int num; - char *str; + const char *str; }; static struct ps_prochandle main_ph; @@ -179,7 +179,7 @@ static td_thr_setgregs_ftype *p_td_thr_setgregs; /* Return the libthread_db error string associated with ERRCODE. If ERRCODE is unknown, return an appropriate message. */ -static char * +static const char * td_err_string (td_err_e errcode) { static struct string_map td_err_table[] = @@ -223,7 +223,7 @@ td_err_string (td_err_e errcode) /* Return the libthread_db state string assicoated with STATECODE. If STATECODE is unknown, return an appropriate message. */ -static char * +static const char * td_state_string (td_thr_state_e statecode) { static struct string_map td_thr_state_table[] = -- 2.34.1