From aaef8ddc32fdbbc7f2778faec3fa8d8366b0bbce Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 17 Apr 2008 17:43:58 +0000 Subject: [PATCH] * source.c (find_and_open_source): Add some comments clarifying handling of FULLNAME argument. Make static. Remove pointless xstrdup/xfree. --- gdb/ChangeLog | 6 ++++++ gdb/source.c | 13 +++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 86a4cbe59a..28d7ae58a3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2008-04-17 Doug Evans + + * source.c (find_and_open_source): Add some comments clarifying + handling of FULLNAME argument. Make static. Remove pointless + xstrdup/xfree. + 2008-04-17 Pedro Alves * inf-loop.c (inferior_event_handler): Also run the intermediate diff --git a/gdb/source.c b/gdb/source.c index 2c69547da1..ceca38bd10 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -927,15 +927,19 @@ rewrite_source_path (const char *path) DIRNAME is the compilation directory of a particular source file. Only some debug formats provide this info. FULLNAME can be the last known absolute path to the file in question. + Space for the path must have been malloc'd. If a path substitution + is applied we free the old value and set a new one. On Success A valid file descriptor is returned. ( the return value is positive ) FULLNAME is set to the absolute path to the file just opened. + The caller is responsible for freeing FULLNAME. On Failure An invalid file descriptor is returned. ( the return value is negative ) FULLNAME is set to NULL. */ -int + +static int find_and_open_source (struct objfile *objfile, const char *filename, const char *dirname, @@ -1022,13 +1026,6 @@ find_and_open_source (struct objfile *objfile, result = openp (path, OPF_SEARCH_IN_PATH, p, OPEN_MODE, 0, fullname); } - if (result >= 0) - { - char *tmp_fullname; - tmp_fullname = *fullname; - *fullname = xstrdup (tmp_fullname); - xfree (tmp_fullname); - } return result; } -- 2.11.0