* source.c (forward_search_command): Don't fclose the stream,

	just run the cleanups.
	(reverse_search_command): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ca7e063..ef4936d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-23  Keith Seitz  <keiths@redhat.com>
+
+       * source.c (forward_search_command): Don't fclose the stream,
+       just run the cleanups.
+       (reverse_search_command): Likewise.
+
 2009-07-23  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        * symtab.c (search_symbols): Add QUIT.

diff --git a/gdb/source.c b/gdb/source.c
index c40a5aa..c39c0a6 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1612,7 +1612,7 @@ forward_search_command (char *regex, int from_tty)
       if (re_exec (buf) > 0)
        {
          /* Match! */
-         fclose (stream);
+         do_cleanups (cleanups);
          print_source_lines (current_source_symtab, line, line + 1, 0);
          set_internalvar_integer (lookup_internalvar ("_"), line);
          current_source_line = max (line - lines_to_list / 2, 1);
@@ -1690,7 +1690,7 @@ reverse_search_command (char *regex, int from_tty)
       if (re_exec (buf) > 0)
        {
          /* Match! */
-         fclose (stream);
+         do_cleanups (cleanups);
          print_source_lines (current_source_symtab, line, line + 1, 0);
          set_internalvar_integer (lookup_internalvar ("_"), line);
          current_source_line = max (line - lines_to_list / 2, 1);
@@ -1699,7 +1699,7 @@ reverse_search_command (char *regex, int from_tty)
       line--;
       if (fseek (stream, current_source_symtab->line_charpos[line - 1], 0) < 0)
        {
-         fclose (stream);
+         do_cleanups (cleanups);
          perror_with_name (current_source_symtab->filename);
        }
     }