Rename `typename' in d-exp.y to avoid C++ reserved word

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

diff --git a/gdb/osdata.c b/gdb/osdata.c
index 066d47fa56fc53a6d6ad59bda2580a02af2072ce..d33026c56fab37bb16ddb20aba2cae03c6cebd3e 100644 (file)
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -1,6 +1,6 @@
 /* Routines for handling XML generic OS data provided by target.
 
-   Copyright (C) 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,7 +22,6 @@
 #include "vec.h"
 #include "xml-support.h"
 #include "osdata.h"
-#include "gdb_string.h"
 #include "ui-out.h"
 #include "gdbcmd.h"
 
@@ -45,8 +44,6 @@ osdata_parse (const char *xml)
 
 #else /* HAVE_LIBEXPAT */
 
-#include "xml-support.h"
-
 /* Internal parsing data passed to all XML callbacks.  */
 struct osdata_parsing_data
   {
@@ -69,7 +66,7 @@ osdata_start_osdata (struct gdb_xml_parser *parser,
     gdb_xml_error (parser, _("Seen more than on osdata element"));
 
   type = xml_find_attribute (attributes, "type")->value;
-  osdata = XZALLOC (struct osdata);
+  osdata = XCNEW (struct osdata);
   osdata->type = xstrdup (type);
   data->osdata = osdata;
 }
@@ -297,6 +294,7 @@ info_osdata_command (char *type, int from_tty)
   struct cleanup *old_chain;
   int ncols = 0;
   int nrows;
+  int col_to_skip = -1;
 
   osdata = get_osdata (type);
   old_chain = make_cleanup_osdata_free (osdata);
@@ -311,6 +309,28 @@ info_osdata_command (char *type, int from_tty)
       last = VEC_last (osdata_item_s, osdata->items);
       if (last->columns)
         ncols = VEC_length (osdata_column_s, last->columns);
+
+      /* As a special case, scan the listing of available data types
+        for a column named "Title", and only include it with MI
+        output; this column's normal use is for titles for interface
+        elements like menus, and it clutters up CLI output.  */
+      if (!type && !ui_out_is_mi_like_p (uiout))
+       {
+         struct osdata_column *col;
+         int ix;
+
+         for (ix = 0;
+              VEC_iterate (osdata_column_s, last->columns, ix, col);
+              ix++)
+           {
+             if (strcmp (col->name, "Title") == 0)
+               col_to_skip = ix;
+           }
+         /* Be sure to reduce the total column count, otherwise
+            internal errors ensue.  */
+         if (col_to_skip >= 0)
+           --ncols;
+       }
     }
 
   make_cleanup_ui_out_table_begin_end (uiout, ncols, nrows,
@@ -335,7 +355,10 @@ info_osdata_command (char *type, int from_tty)
           ix++)
        {
          char col_name[32];
-         
+
+         if (ix == col_to_skip)
+           continue;
+
          snprintf (col_name, 32, "col%d", ix);
          ui_out_table_header (uiout, 10, ui_left,
                               col_name, col->name);
@@ -366,7 +389,10 @@ info_osdata_command (char *type, int from_tty)
               ix_cols++)
           {
             char col_name[32];
-            
+
+            if (ix_cols == col_to_skip)
+              continue;
+
             snprintf (col_name, 32, "col%d", ix_cols);
             ui_out_field_string (uiout, col_name, col->value);
           }