Change get_filename_and_charpos to return void

The return value from get_filename_and_charpos is never used, so this
patch changes it to return void.

gdb/ChangeLog
2018-11-19  Tom Tromey  <tom@tromey.com>

	* source.c (get_filename_and_charpos): Return void.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f5e64cdb28aced747671e0255f265408ce23d52..6973f427d0d2813f49e708cf7c34585279746428 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-19  Tom Tromey  <tom@tromey.com>
+
+       * source.c (get_filename_and_charpos): Return void.
+
 2018-11-19  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * skip.c (_initialize_step_skip): Fix "info skip" help.

diff --git a/gdb/source.c b/gdb/source.c
index 59f00fc38fb43ad0e0d6e100c696830cc28f0b40..b38eed5be687c9df5788e8d650127d09903a3158 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -49,10 +49,6 @@
 #define OPEN_MODE (O_RDONLY | O_BINARY)
 #define FDOPEN_MODE FOPEN_RB
 
-/* Prototypes for local functions.  */
-
-static int get_filename_and_charpos (struct symtab *, char **);
-
 /* Path of directories to search for source files.
    Same format as the PATH environment variable's value.  */
 
@@ -1209,29 +1205,23 @@ find_source_lines (struct symtab *s, int desc)
 \f
 
 /* Get full pathname and line number positions for a symtab.
-   Return nonzero if line numbers may have changed.
    Set *FULLNAME to actual name of the file as found by `openp',
    or to 0 if the file is not found.  */
 
-static int
+static void
 get_filename_and_charpos (struct symtab *s, char **fullname)
 {
-  int linenums_changed = 0;
-
   scoped_fd desc = open_source_file (s);
   if (desc.get () < 0)
     {
       if (fullname)
        *fullname = NULL;
-      return 0;
+      return;
     }
   if (fullname)
     *fullname = s->fullname;
   if (s->line_charpos == 0)
-    linenums_changed = 1;
-  if (linenums_changed)
     find_source_lines (s, desc.get ());
-  return linenums_changed;
 }
 
 /* Print text describing the full name of the source file S