/* Routines for handling XML generic OS data provided by target.
- Copyright (C) 2008-2012 Free Software Foundation, Inc.
+ Copyright (C) 2008-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "vec.h"
#include "xml-support.h"
#include "osdata.h"
-#include "gdb_string.h"
#include "ui-out.h"
#include "gdbcmd.h"
#else /* HAVE_LIBEXPAT */
-#include "xml-support.h"
-
/* Internal parsing data passed to all XML callbacks. */
struct osdata_parsing_data
{
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- struct osdata_parsing_data *data = user_data;
+ struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data;
char *type;
struct osdata *osdata;
if (data->osdata)
gdb_xml_error (parser, _("Seen more than on osdata element"));
- type = xml_find_attribute (attributes, "type")->value;
- osdata = XZALLOC (struct osdata);
+ type = (char *) xml_find_attribute (attributes, "type")->value;
+ osdata = XCNEW (struct osdata);
osdata->type = xstrdup (type);
data->osdata = osdata;
}
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- struct osdata_parsing_data *data = user_data;
+ struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data;
struct osdata_item item = { NULL };
VEC_safe_push (osdata_item_s, data->osdata->items, &item);
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- struct osdata_parsing_data *data = user_data;
- const char *name = xml_find_attribute (attributes, "name")->value;
+ struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data;
+ const char *name
+ = (const char *) xml_find_attribute (attributes, "name")->value;
data->property_name = xstrdup (name);
}
const struct gdb_xml_element *element,
void *user_data, const char *body_text)
{
- struct osdata_parsing_data *data = user_data;
+ struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data;
struct osdata *osdata = data->osdata;
struct osdata_item *item = VEC_last (osdata_item_s, osdata->items);
struct osdata_column *col = VEC_safe_push (osdata_column_s,
static void
clear_parsing_data (void *p)
{
- struct osdata_parsing_data *data = p;
+ struct osdata_parsing_data *data = (struct osdata_parsing_data *) p;
osdata_free (data->osdata);
data->osdata = NULL;
static void
osdata_free_cleanup (void *arg)
{
- struct osdata *osdata = arg;
+ struct osdata *osdata = (struct osdata *) arg;
osdata_free (osdata);
}
return NULL;
}
-static void
-info_osdata_command (char *type, int from_tty)
+void
+info_osdata (const char *type)
{
struct ui_out *uiout = current_uiout;
struct osdata *osdata = NULL;
struct cleanup *old_chain;
int ncols = 0;
int nrows;
+ int col_to_skip = -1;
+
+ if (type == NULL)
+ type = "";
osdata = get_osdata (type);
old_chain = make_cleanup_osdata_free (osdata);
nrows = VEC_length (osdata_item_s, osdata->items);
- if (!type && nrows == 0)
+ if (*type == '\0' && nrows == 0)
error (_("Available types of OS data not reported."));
if (!VEC_empty (osdata_item_s, osdata->items))
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 == '\0' && !uiout->is_mi_like_p ())
+ {
+ 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,
- "OSDataTable");
+ ui_out_emit_table table_emitter (uiout, ncols, nrows, "OSDataTable");
/* With no columns/items, we just output an empty table, but we
still output the table. This matters for MI. */
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,
+ uiout->table_header (10, ui_left,
col_name, col->name);
}
}
- ui_out_table_body (uiout);
+ uiout->table_body ();
if (nrows != 0)
{
ix_items, item);
ix_items++)
{
- struct cleanup *old_chain;
- struct ui_stream *stb;
int ix_cols;
struct osdata_column *col;
- stb = ui_out_stream_new (uiout);
- old_chain = make_cleanup_ui_out_stream_delete (stb);
- make_cleanup_ui_out_tuple_begin_end (uiout, "item");
-
- for (ix_cols = 0;
- VEC_iterate (osdata_column_s, item->columns,
- ix_cols, col);
- ix_cols++)
- {
- char col_name[32];
-
- snprintf (col_name, 32, "col%d", ix_cols);
- ui_out_field_string (uiout, col_name, col->value);
- }
-
- do_cleanups (old_chain);
-
- ui_out_text (uiout, "\n");
+ {
+ ui_out_emit_tuple tuple_emitter (uiout, "item");
+
+ for (ix_cols = 0;
+ VEC_iterate (osdata_column_s, item->columns,
+ ix_cols, col);
+ ix_cols++)
+ {
+ char col_name[32];
+
+ if (ix_cols == col_to_skip)
+ continue;
+
+ snprintf (col_name, 32, "col%d", ix_cols);
+ uiout->field_string (col_name, col->value);
+ }
+ }
+
+ uiout->text ("\n");
}
}
do_cleanups (old_chain);
}
-extern initialize_file_ftype _initialize_osdata; /* -Wmissing-prototypes */
+static void
+info_osdata_command (char *arg, int from_tty)
+{
+ info_osdata (arg);
+}
void
_initialize_osdata (void)
projects / deliverable / binutils-gdb.git / blobdiff