X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fc-valprint.c;h=607fb80c58f36214026c165eff11c03497cd914d;hb=c0c3707ff46ccfb78ea175dd42d628d8c90dca8b;hp=d5ddd3ece7a01e15ea7f486dabe2ae83a952ef3b;hpb=c119e04082b5b3ee907a8d02b42fae2aee0c4fbb;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index d5ddd3ece7..607fb80c58 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -187,7 +187,7 @@ print_unpacked_pointer (struct type *type, struct type *elttype,
 	  if (want_space)
 	    fputs_filtered (" ", stream);
 	  fputs_filtered (" <", stream);
-	  fputs_filtered (MSYMBOL_PRINT_NAME (msymbol.minsym), stream);
+	  fputs_filtered (msymbol.minsym->print_name (), stream);
 	  fputs_filtered (">", stream);
 	  want_space = 1;
 	}
@@ -197,16 +197,14 @@ print_unpacked_pointer (struct type *type, struct type *elttype,
 	  struct value *vt_val;
 	  struct symbol *wsym = NULL;
 	  struct type *wtype;
-	  struct block *block = NULL;
 
 	  if (want_space)
 	    fputs_filtered (" ", stream);
 
 	  if (msymbol.minsym != NULL)
 	    {
-	      const char *search_name
-		= MSYMBOL_SEARCH_NAME (msymbol.minsym);
-	      wsym = lookup_symbol_search_name (search_name, block,
+	      const char *search_name = msymbol.minsym->search_name ();
+	      wsym = lookup_symbol_search_name (search_name, NULL,
 						VAR_DOMAIN).symbol;
 	    }
 
@@ -248,8 +246,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
     {
       LONGEST low_bound, high_bound;
       int eltlen, len;
-      struct gdbarch *gdbarch = get_type_arch (type);
-      enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+      enum bfd_endian byte_order = type_byte_order (type);
       unsigned int i = 0;	/* Number of characters printed.  */
 
       if (!get_array_bounds (type, &low_bound, &high_bound))