* i386-tdep.c (i386_match_insn_block): Use length of the proper

[deliverable/binutils-gdb.git] / gdb / cp-support.c

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index f849a4663f7355615b75b97ef504a786e2c5dcc9..a4790671894e34b7aa05e0da0d72313ad140b946 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
@@ -778,11 +778,13 @@ make_symbol_overload_list_namespace (const char *func_name,
 
   /* Look in the static block.  */
   block = block_static_block (get_selected_block (0));
-  make_symbol_overload_list_block (name, block);
+  if (block)
+    make_symbol_overload_list_block (name, block);
 
   /* Look in the global block.  */
   block = block_global_block (block);
-  make_symbol_overload_list_block (name, block);
+  if (block)
+    make_symbol_overload_list_block (name, block);
 
 }
 
@@ -835,7 +837,7 @@ make_symbol_overload_list_adl_namespace (struct type *type,
       }
 }
 
-/* Adds the the overload list overload candidates for FUNC_NAME found
+/* Adds the overload list overload candidates for FUNC_NAME found
    through argument dependent lookup.  */
 
 struct symbol **
@@ -1016,7 +1018,8 @@ cp_lookup_rtti_type (const char *name, struct block *block)
 static  void
 maint_cplus_command (char *arg, int from_tty)
 {
-  printf_unfiltered (_("\"maintenance cplus\" must be followed by the name of a command.\n"));
+  printf_unfiltered (_("\"maintenance cplus\" must be followed "
+                      "by the name of a command.\n"));
   help_list (maint_cplus_cmd_list,
             "maintenance cplus ",
             -1, gdb_stdout);