From 2e7bf1d7210ee79b93ba9ce4462e22e71097a102 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 9 Mar 2015 11:58:23 +0000 Subject: [PATCH] constify i386-sol2-tdep.c and machoread.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit /home/pedro/gdb/mygit/src/gdb/i386-sol2-tdep.c: In function ‘const char* i386_sol2_static_transform_name(const char*)’: /home/pedro/gdb/mygit/src/gdb/i386-sol2-tdep.c:93:29: error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive] p = strrchr (name, '.'); ^ gdb: 2015-03-20 Pedro Alves * i386-sol2-tdep.c (i386_sol2_static_transform_name): Move "p" to inner block and make it const. * machoread.c (get_archive_prefix_len): Make "lparen" const. --- gdb/ChangeLog | 6 ++++++ gdb/i386-sol2-tdep.c | 3 ++- gdb/machoread.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 04cd47d43cd..72555330412 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-03-20 Pedro Alves + + * i386-sol2-tdep.c (i386_sol2_static_transform_name): Move "p" to + inner block and make it const. + * machoread.c (get_archive_prefix_len): Make "lparen" const. + 2015-03-20 Pedro Alves * breakpoint.c (set_breakpoint_condition): Make argument "exp" const. diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c index af783dfc634..59f9be76e64 100644 --- a/gdb/i386-sol2-tdep.c +++ b/gdb/i386-sol2-tdep.c @@ -80,9 +80,10 @@ i386_sol2_mcontext_addr (struct frame_info *this_frame) static const char * i386_sol2_static_transform_name (const char *name) { - char *p; if (name[0] == '.') { + const char *p; + /* For file-local statics there will be a period, a bunch of junk (the contents of which match a string given in the N_OPT), a period and the name. For function-local statics diff --git a/gdb/machoread.c b/gdb/machoread.c index 831bbcb622e..675155e97b6 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -343,7 +343,7 @@ macho_symtab_read (struct objfile *objfile, static int get_archive_prefix_len (const char *name) { - char *lparen; + const char *lparen; int name_len = strlen (name); if (name_len == 0 || name[name_len - 1] != ')') -- 2.30.2