Remove IRIX 5 <sys/proc.h> _KMEMUSER workaround

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

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 32989d41a55a2dd628fde9f9a8adeadcaa3c72e5..920c21fbcf03fc4c61571ba653499b7e96769f3d 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -288,7 +288,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
 
   if ((show <= 0) && (TYPE_NAME (type) != NULL))
     {
-      fputs_filtered (TYPE_NAME (type), stream);
+      fprintfi_filtered (level, stream, "%s", TYPE_NAME (type));
       return;
     }
 
@@ -308,12 +308,12 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
 
     case TYPE_CODE_PTR:
       fprintf_filtered (stream, "PTR TO -> ( ");
-      f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
+      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
       break;
 
     case TYPE_CODE_REF:
       fprintf_filtered (stream, "REF TO -> ( ");
-      f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
+      f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
       break;
 
     case TYPE_CODE_VOID:
@@ -364,19 +364,24 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
       else
        fprintfi_filtered (level, stream, "Type ");
       fputs_filtered (TYPE_TAG_NAME (type), stream);
-      fputs_filtered ("\n", stream);
-      for (index = 0; index < TYPE_NFIELDS (type); index++)
+      /* According to the definition,
+         we only print structure elements in case show > 0.  */
+      if (show > 0)
        {
-         f_type_print_base (TYPE_FIELD_TYPE (type, index), stream, show,
-                            level + 4);
-         fputs_filtered (" :: ", stream);
-         fputs_filtered (TYPE_FIELD_NAME (type, index), stream);
-         f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index),
-                                      stream, 0, 0, 0, 0);
          fputs_filtered ("\n", stream);
-       } 
-      fprintfi_filtered (level, stream, "End Type ");
-      fputs_filtered (TYPE_TAG_NAME (type), stream);
+         for (index = 0; index < TYPE_NFIELDS (type); index++)
+           {
+             f_type_print_base (TYPE_FIELD_TYPE (type, index), stream,
+                                show - 1, level + 4);
+             fputs_filtered (" :: ", stream);
+             fputs_filtered (TYPE_FIELD_NAME (type, index), stream);
+             f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index),
+                                          stream, show - 1, 0, 0, 0);
+             fputs_filtered ("\n", stream);
+           }
+         fprintfi_filtered (level, stream, "End Type ");
+         fputs_filtered (TYPE_TAG_NAME (type), stream);
+       }
       break;
 
     case TYPE_CODE_MODULE: