X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-valprint.c;h=58bbc7ca390677afc0fbe3175324473bab5d05f4;hb=27e232885db363fb545fd2f450e72d929e59b8f6;hp=ff2bec865a83b9c11501f17552d8ba360dbe220b;hpb=ed288bb597072176e84fc8279707a3f2f475779b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index ff2bec865a..58bbc7ca39 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -1,5 +1,5 @@
 /* Support for printing C++ values for GDB, the GNU debugger.
-   Copyright 1986, 1988, 1989, 1991, 1994, 1995, 1996
+   Copyright 1986, 1988, 1989, 1991, 1994-1996, 2000
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -45,26 +45,28 @@ int static_field_print;		/* Controls printing of static fields. */
 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
 
-extern void _initialize_cp_valprint PARAMS ((void));
+extern void _initialize_cp_valprint (void);
 
-static void
-cp_print_static_field PARAMS ((struct type *, value_ptr, GDB_FILE *, int, int,
-			       enum val_prettyprint));
+static void cp_print_static_field (struct type *, value_ptr,
+				   struct ui_file *, int, int,
+				   enum val_prettyprint);
 
-static void
-cp_print_value PARAMS ((struct type *, struct type *, char *, int, CORE_ADDR, GDB_FILE *,
-			int, int, enum val_prettyprint, struct type **));
+static void cp_print_value (struct type *, struct type *, char *, int,
+			    CORE_ADDR, struct ui_file *, int, int,
+			    enum val_prettyprint, struct type **);
 
-static void
-cp_print_hpacc_virtual_table_entries PARAMS ((struct type *, int *, value_ptr, GDB_FILE *,
-					   int, int, enum val_prettyprint));
+static void cp_print_hpacc_virtual_table_entries (struct type *, int *,
+						  value_ptr,
+						  struct ui_file *, int,
+						  int,
+						  enum val_prettyprint);
 
 
 void
 cp_print_class_method (valaddr, type, stream)
      char *valaddr;
      struct type *type;
-     GDB_FILE *stream;
+     struct ui_file *stream;
 {
   struct type *domain;
   struct fn_field *f = NULL;
@@ -237,7 +239,7 @@ cp_print_value_fields (type, real_type, valaddr, offset, address, stream, format
      char *valaddr;
      int offset;
      CORE_ADDR address;
-     GDB_FILE *stream;
+     struct ui_file *stream;
      int format;
      int recurse;
      enum val_prettyprint pretty;
@@ -427,7 +429,7 @@ cp_print_value_fields (type, real_type, valaddr, offset, address, stream, format
       /* pai: FIXME 32x64 problem? */
       /* Not sure what the best notation is in the case where there is no
          baseclass name.  */
-      v = value_from_longest (lookup_pointer_type (builtin_type_unsigned_long),
+      v = value_from_pointer (lookup_pointer_type (builtin_type_unsigned_long),
 			      *(unsigned long *) (valaddr + offset));
 
       val_print (VALUE_TYPE (v), VALUE_CONTENTS (v), 0, 0,
@@ -500,7 +502,7 @@ cp_print_value (type, real_type, valaddr, offset, address, stream, format, recur
      char *valaddr;
      int offset;
      CORE_ADDR address;
-     GDB_FILE *stream;
+     struct ui_file *stream;
      int format;
      int recurse;
      enum val_prettyprint pretty;
@@ -628,7 +630,7 @@ static void
 cp_print_static_field (type, val, stream, format, recurse, pretty)
      struct type *type;
      value_ptr val;
-     GDB_FILE *stream;
+     struct ui_file *stream;
      int format;
      int recurse;
      enum val_prettyprint pretty;
@@ -669,7 +671,7 @@ void
 cp_print_class_member (valaddr, domain, stream, prefix)
      char *valaddr;
      struct type *domain;
-     GDB_FILE *stream;
+     struct ui_file *stream;
      char *prefix;
 {
 
@@ -726,7 +728,7 @@ cp_print_class_member (valaddr, domain, stream, prefix)
 	fprintf_filtered (stream, " (offset in bits)");
     }
   else
-    fprintf_filtered (stream, "%d", val >> 3);
+    fprintf_filtered (stream, "%ld", (long) (val >> 3));
 }
 
 
@@ -748,7 +750,7 @@ cp_print_hpacc_virtual_table_entries (type, vfuncs, v, stream, format, recurse,
      struct type *type;
      int *vfuncs;
      value_ptr v;
-     GDB_FILE *stream;
+     struct ui_file *stream;
      int format;
      int recurse;
      enum val_prettyprint pretty;