From: Tom Tromey Date: Fri, 17 May 2019 14:42:10 +0000 (-0600) Subject: Don't cast away const in find_and_open_source X-Git-Url: https://repo.jachan.dev/binutils.git/commitdiff_plain/33d0e35aed8870ad317af7eeca5274cf4fd87d15 Don't cast away const in find_and_open_source find_and_open_source casts away const, but hasn't needed to in a while. This removes the cast and a strangely hostile comment. gdb/ChangeLog 2019-05-17 Tom Tromey * source.c (find_and_open_source): Remove cast. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 146cb00ef4..713b1cae3b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-05-17 Tom Tromey + + * source.c (find_and_open_source): Remove cast. + 2019-05-17 Tom Tromey * annotate.c (annotate_source): Make "filename" const. diff --git a/gdb/source.c b/gdb/source.c index b61880ab50..9a30209880 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1009,9 +1009,7 @@ find_and_open_source (const char *filename, /* Replace a path entry of $cdir with the compilation directory name. */ #define cdir_len 5 - /* We cast strstr's result in case an ANSIhole has made it const, - which produces a "required warning" when assigned to a nonconst. */ - p = (char *) strstr (source_path, "$cdir"); + p = strstr (source_path, "$cdir"); if (p && (p == path || p[-1] == DIRNAME_SEPARATOR) && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0')) {