diff options
| author | Pedro Alves <palves@redhat.com> | 2015-03-09 11:58:23 +0000 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2015-03-20 17:39:29 +0000 |
| commit | 2e7bf1d7210ee79b93ba9ce4462e22e71097a102 (patch) | |
| tree | 64359f543fb22dd0d5e4eb898cff8d5cf50f1b52 | |
| parent | 7a26bd4d83e5549137943de5f2c7b1ae90821093 (diff) | |
| download | binutils-gdb-2e7bf1d7210ee79b93ba9ce4462e22e71097a102.tar.gz | |
constify i386-sol2-tdep.c and machoread.c
/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 <palves@redhat.com>
* 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.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/i386-sol2-tdep.c | 3 | ||||
| -rw-r--r-- | 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,5 +1,11 @@ 2015-03-20 Pedro Alves <palves@redhat.com> + * 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 <palves@redhat.com> + * breakpoint.c (set_breakpoint_condition): Make argument "exp" const. * breakpoint.h (set_breakpoint_condition): Update declaration. 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] != ')') |