* gdb.texinfo (Continuing and Stepping): When talking about "step"

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

diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 52ac3117dd48fc7216151650ccc7b9c6b5e02cb6..92e26140bb7799e4f7d22e5ae1c47019f2110626 100644 (file)
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -57,7 +57,7 @@ void
 type_print (type, varstring, stream, show)
      struct type *type;
      char *varstring;
-     FILE *stream;
+     GDB_FILE *stream;
      int show;
 {
   LA_PRINT_TYPE (type, varstring, stream, show, 0);
@@ -73,7 +73,7 @@ whatis_exp (exp, show)
 {
   struct expression *expr;
   register value val;
-  register struct cleanup *old_chain;
+  register struct cleanup *old_chain = NULL;
 
   if (exp)
     {
@@ -85,7 +85,7 @@ whatis_exp (exp, show)
     val = access_value_history (0);
 
   printf_filtered ("type = ");
-  type_print (VALUE_TYPE (val), "", stdout, show);
+  type_print (VALUE_TYPE (val), "", gdb_stdout, show);
   printf_filtered ("\n");
 
   if (exp)
@@ -146,7 +146,7 @@ ptype_command (typename, from_tty)
        {
          /* User did "ptype <typename>" */
          printf_filtered ("type = ");
-         type_print (type, "", stdout, 1);
+         type_print (type, "", gdb_stdout, 1);
          printf_filtered ("\n");
          do_cleanups (old_chain);
        }
@@ -175,7 +175,7 @@ void
 print_type_scalar (type, val, stream)
      struct type *type;
      LONGEST val;
-     FILE *stream;
+     GDB_FILE *stream;
 {
   unsigned int i;
   unsigned len;
@@ -198,20 +198,12 @@ print_type_scalar (type, val, stream)
        }
       else
        {
-#ifdef LONG_LONG
-         fprintf_filtered (stream, "%lld", val);
-#else
-         fprintf_filtered (stream, "%ld", val);
-#endif
+         print_longest (stream, 'd', 0, val);
        }
       break;
 
     case TYPE_CODE_INT:
-#ifdef LONG_LONG
-      fprintf_filtered (stream, TYPE_UNSIGNED (type) ? "%llu" : "%lld", val);
-#else
-      fprintf_filtered (stream, TYPE_UNSIGNED (type) ? "%u" : "%d", val);
-#endif
+      print_longest (stream, TYPE_UNSIGNED (type) ? 'u' : 'd', 0, val);
       break;
 
     case TYPE_CODE_CHAR:
@@ -243,7 +235,7 @@ print_type_scalar (type, val, stream)
     default:
       error ("Invalid type code in symbol table.");
     }
-  fflush (stream);
+  gdb_flush (stream);
 }
 
 #if MAINTENANCE_CMDS
@@ -295,8 +287,8 @@ _initialize_typeprint ()
 
   add_com ("ptype", class_vars, ptype_command,
           "Print definition of type TYPE.\n\
-Argument may be a type name defined by typedef, or \"struct STRUCTNAME\"\n\
-or \"union UNIONNAME\" or \"enum ENUMNAME\".\n\
+Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
+or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\
 The selected stack frame's lexical context is used to look up the name.");
 
   add_com ("whatis", class_vars, whatis_command,