2010-07-09 Hui Zhu <teawater@gmail.com>

	* source.c (print_source_lines_base): Add check for noprint.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b70e0e0836b483dba09ca44864e7c0a72729e4dc..2b49e0c4185c98083050440912146c832e2681a4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-09  Hui Zhu  <teawater@gmail.com>
+
+       * source.c (print_source_lines_base): Add check for noprint.
+
 2010-07-07  Joel Brobecker  <brobecker@adacore.com>
 
        * version.in: Set version to 7.1.90.20100707-cvs.

diff --git a/gdb/source.c b/gdb/source.c
index 39bd06a7792911104c8382d8124843d8f07c26b2..3e896726a04aec0b9d90762d6c913e8be075d10d 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1293,6 +1293,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
 {
   int c;
   int desc;
+  int noprint = 0;
   FILE *stream;
   int nlines = stopline - line;
   struct cleanup *cleanup;
@@ -1319,11 +1320,12 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
     }
   else
     {
-      desc = -1;
+      desc = last_source_error;
       noerror = 1;
+      noprint = 1;
     }
 
-  if (desc < 0)
+  if (desc < 0 || noprint)
     {
       last_source_error = desc;