[FYI 2/2] Don't cast away const in find_and_open_source

Tom Tromey tromey@adacore.com
Fri May 17 16:22:00 GMT 2019


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  <tromey@adacore.com>

	* source.c (find_and_open_source): Remove cast.
---
 gdb/ChangeLog | 4 ++++
 gdb/source.c  | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gdb/source.c b/gdb/source.c
index b61880ab503..9a30209880b 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'))
 	{
-- 
2.20.1



More information about the Gdb-patches mailing list