* win32-low.c (create_process): New.

[deliverable/binutils-gdb.git] / gdb / printcmd.c

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 45d7e8afd0359fed9ebe45a5a27d76ad08b17405..9fc716b88200bdb49f4181b623d5c7462be3c1b4 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -8,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "gdb_string.h"
@@ -565,7 +563,6 @@ build_address_symbolic (CORE_ADDR addr,  /* IN */
 {
   struct minimal_symbol *msymbol;
   struct symbol *symbol;
-  struct symtab *symtab = 0;
   CORE_ADDR name_location = 0;
   asection *section = 0;
   char *name_temp = "";
@@ -613,7 +610,6 @@ build_address_symbolic (CORE_ADDR addr,  /* IN */
          /* The msymbol is closer to the address than the symbol;
             use the msymbol instead.  */
          symbol = 0;
-         symtab = 0;
          name_location = SYMBOL_VALUE_ADDRESS (msymbol);
          if (do_demangle || asm_demangle)
            name_temp = SYMBOL_PRINT_NAME (msymbol);
@@ -650,16 +646,6 @@ build_address_symbolic (CORE_ADDR addr,  /* IN */
          *filename = xstrdup (sal.symtab->filename);
          *line = sal.line;
        }
-      else if (symtab && symbol && symbol->line)
-       {
-         *filename = xstrdup (symtab->filename);
-         *line = symbol->line;
-       }
-      else if (symtab)
-       {
-         *filename = xstrdup (symtab->filename);
-         *line = -1;
-       }
     }
   return 0;
 }
@@ -1520,7 +1506,7 @@ do_one_display (struct display *d)
       print_expression (d->exp, gdb_stdout);
       annotate_display_expression_end ();
 
-      if (d->format.count != 1)
+      if (d->format.count != 1 || d->format.format == 'i')
        printf_filtered ("\n");
       else
        printf_filtered ("  ");