From 9340a6c0be7b3c4ed008c16c42a9da1350b42c10 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 1 Mar 2012 21:09:16 +0000 Subject: [PATCH] 2012-03-01 Pedro Alves * psymtab.c (find_and_open_source): Delete declaration. * source.c (find_and_open_source): Move comment ... * source.h (find_and_open_source): ... to this new declaration. --- gdb/ChangeLog | 6 ++++++ gdb/psymtab.c | 4 ---- gdb/source.c | 20 -------------------- gdb/source.h | 23 +++++++++++++++++++++++ 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ccf0dc..9bdad8e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2012-03-01 Pedro Alves + * psymtab.c (find_and_open_source): Delete declaration. + * source.c (find_and_open_source): Move comment ... + * source.h (find_and_open_source): ... to this new declaration. + +2012-03-01 Pedro Alves + * inline-frame.c: Include inline-frame.h. 2012-03-01 Pedro Alves diff --git a/gdb/psymtab.c b/gdb/psymtab.c index e42545b..f894028 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1131,10 +1131,6 @@ map_symbol_filenames_psymtab (struct objfile *objfile, } } -int find_and_open_source (const char *filename, - const char *dirname, - char **fullname); - /* Finds the fullname that a partial_symtab represents. If this functions finds the fullname, it will save it in ps->fullname diff --git a/gdb/source.c b/gdb/source.c index 909f252..cfdf81b 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -971,26 +971,6 @@ rewrite_source_path (const char *path) return new_path; } -/* This function is capable of finding the absolute path to a - source file, and opening it, provided you give it a FILENAME. Both the - DIRNAME and FULLNAME are only added suggestions on where to find the file. - - FILENAME should be the filename to open. - 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 find_and_open_source (const char *filename, const char *dirname, diff --git a/gdb/source.h b/gdb/source.h index 3ee8e53..bf9a688 100644 --- a/gdb/source.h +++ b/gdb/source.h @@ -21,6 +21,29 @@ struct symtab; +/* This function is capable of finding the absolute path to a + source file, and opening it, provided you give it a FILENAME. Both the + DIRNAME and FULLNAME are only added suggestions on where to find the file. + + FILENAME should be the filename to open. + 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. */ +extern int find_and_open_source (const char *filename, + const char *dirname, + char **fullname); + /* Open a source file given a symtab S. Returns a file descriptor or negative number for error. */ extern int open_source_file (struct symtab *s); -- 2.7.4