* serial.h (SERIAL_SET_TTY_STATE): Comment return value.

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

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 33e6742e816643e226ce8faac08461116ed2adcf..9654c479503c440be9dbb297a0f50a834978a2d7 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -409,12 +409,12 @@ c_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
       break;
 
     case TYPE_CODE_FUNC:
-      c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
-                                passed_a_ptr, 0);
       if (passed_a_ptr)
        fprintf_filtered (stream, ")");
       if (!demangled_args)
        fprintf_filtered (stream, "()");
+      c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
+                                  passed_a_ptr, 0);
       break;
 
     case TYPE_CODE_UNDEF:
@@ -443,12 +443,12 @@ c_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
 
    SHOW positive means print details about the type (e.g. enum values),
    and print structure elements passing SHOW - 1 for show.
-   SHOW zero means just print the type name or struct tag if there is one.
+   SHOW negative means just print the type name or struct tag if there is one.
    If there is no name, print something sensible but concise like
    "struct {...}".
-   SHOW negative means the same things as SHOW zero.  The difference is that
-   zero is used for printing structure elements and -1 is used for the
-   "whatis" command.  But I don't see any need to distinguish.
+   SHOW zero means just print the type name or struct tag if there is one.
+   If there is no name, print something sensible but not as concise like
+   "struct {int x; int y;}".
 
    LEVEL is the number of spaces to indent by.
    We increase it for some recursive calls.  */
@@ -488,6 +488,8 @@ c_type_print_base (type, stream, show, level)
       return;
     }
 
+  check_stub_type (type);
+         
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_ARRAY:
@@ -521,16 +523,14 @@ c_type_print_base (type, stream, show, level)
            fputs_filtered (" ", stream);
        }
       wrap_here ("    ");
-      if (show <= 0)
+      if (show < 0)
        {
          /* If we just printed a tag name, no need to print anything else.  */
          if (TYPE_TAG_NAME (type) == NULL)
            fprintf_filtered (stream, "{...}");
        }
-      else if (show > 0)
+      else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
        {
-         check_stub_type (type);
-         
          cp_type_print_derivation_info (stream, type);
          
          fprintf_filtered (stream, "{\n");
@@ -730,13 +730,13 @@ c_type_print_base (type, stream, show, level)
        }
 
       wrap_here ("    ");
-      if (show <= 0)
+      if (show < 0)
        {
          /* If we just printed a tag name, no need to print anything else.  */
          if (TYPE_TAG_NAME (type) == NULL)
            fprintf_filtered (stream, "{...}");
        }
-      else if (show > 0)
+      else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
        {
          fprintf_filtered (stream, "{");
          len = TYPE_NFIELDS (type);