X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fosdata.c;h=4bd1a0b9b28e99ca0f424f8fa74e567bab8fbda6;hb=1d29ab86cb5145cac5045c1a4113d8b8fbd4d9c6;hp=887b4e3d2828babe224c39b1dbd605234965c899;hpb=e26167887817eaf9d6a4db73b96ca1dde47a7ac2;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/osdata.c b/gdb/osdata.c index 887b4e3d28..4bd1a0b9b2 100644 --- 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -19,16 +19,14 @@ #include "defs.h" #include "target.h" -#include "vec.h" #include "xml-support.h" #include "osdata.h" -#include #include "ui-out.h" #include "gdbcmd.h" #if !defined(HAVE_LIBEXPAT) -struct osdata * +std::unique_ptr osdata_parse (const char *xml) { static int have_warned; @@ -47,29 +45,26 @@ osdata_parse (const char *xml) /* Internal parsing data passed to all XML callbacks. */ struct osdata_parsing_data - { - struct osdata *osdata; - char *property_name; - }; +{ + std::unique_ptr osdata; + std::string property_name; +}; /* Handle the start of a element. */ static void osdata_start_osdata (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, - void *user_data, VEC(gdb_xml_value_s) *attributes) + void *user_data, + std::vector &attributes) { - struct osdata_parsing_data *data = user_data; - char *type; - struct osdata *osdata; + struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; - if (data->osdata) + if (data->osdata != NULL) gdb_xml_error (parser, _("Seen more than on osdata element")); - type = xml_find_attribute (attributes, "type")->value; - osdata = XZALLOC (struct osdata); - osdata->type = xstrdup (type); - data->osdata = osdata; + char *type = (char *) xml_find_attribute (attributes, "type")->value.get (); + data->osdata.reset (new struct osdata (std::string (type))); } /* Handle the start of a element. */ @@ -77,12 +72,11 @@ osdata_start_osdata (struct gdb_xml_parser *parser, static void osdata_start_item (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, - void *user_data, VEC(gdb_xml_value_s) *attributes) + void *user_data, + std::vector &attributes) { - struct osdata_parsing_data *data = user_data; - struct osdata_item item = { NULL }; - - VEC_safe_push (osdata_item_s, data->osdata->items, &item); + struct osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; + data->osdata->items.emplace_back (); } /* Handle the start of a element. */ @@ -90,12 +84,14 @@ osdata_start_item (struct gdb_xml_parser *parser, static void osdata_start_column (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, - void *user_data, VEC(gdb_xml_value_s) *attributes) + void *user_data, + std::vector &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.get (); - data->property_name = xstrdup (name); + data->property_name.assign (name); } /* Handle the end of a element. */ @@ -105,29 +101,12 @@ osdata_end_column (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - struct osdata_parsing_data *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, - item->columns, NULL); - - /* Transfer memory ownership. NAME was already strdup'ed. */ - col->name = data->property_name; - col->value = xstrdup (body_text); - data->property_name = NULL; -} + osdata_parsing_data *data = (struct osdata_parsing_data *) user_data; + struct osdata *osdata = data->osdata.get (); + osdata_item &item = osdata->items.back (); -/* Discard the constructed osdata (if an error occurs). */ - -static void -clear_parsing_data (void *p) -{ - struct osdata_parsing_data *data = p; - - osdata_free (data->osdata); - data->osdata = NULL; - xfree (data->property_name); - data->property_name = NULL; + item.columns.emplace_back (std::move (data->property_name), + std::string (body_text)); } /* The allowed elements and attributes for OS data object. @@ -163,95 +142,31 @@ const struct gdb_xml_element osdata_elements[] = { { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; -struct osdata * +std::unique_ptr osdata_parse (const char *xml) { - struct cleanup *back_to; - struct osdata_parsing_data data = { NULL }; - - back_to = make_cleanup (clear_parsing_data, &data); + osdata_parsing_data data; if (gdb_xml_parse_quick (_("osdata"), "osdata.dtd", osdata_elements, xml, &data) == 0) { /* Parsed successfully, don't need to delete the result. */ - discard_cleanups (back_to); - return data.osdata; + return std::move (data.osdata); } - do_cleanups (back_to); return NULL; } #endif -static void -osdata_item_clear (struct osdata_item *item) -{ - if (item->columns != NULL) - { - struct osdata_column *col; - int ix; - - for (ix = 0; - VEC_iterate (osdata_column_s, item->columns, - ix, col); - ix++) - { - xfree (col->name); - xfree (col->value); - } - VEC_free (osdata_column_s, item->columns); - item->columns = NULL; - } -} - -void -osdata_free (struct osdata *osdata) -{ - if (osdata == NULL) - return; - - if (osdata->items != NULL) - { - struct osdata_item *item; - int ix; - - for (ix = 0; - VEC_iterate (osdata_item_s, osdata->items, - ix, item); - ix++) - osdata_item_clear (item); - VEC_free (osdata_item_s, osdata->items); - } - - xfree (osdata); -} - -static void -osdata_free_cleanup (void *arg) -{ - struct osdata *osdata = arg; - - osdata_free (osdata); -} - -struct cleanup * -make_cleanup_osdata_free (struct osdata *data) -{ - return make_cleanup (osdata_free_cleanup, data); -} - -struct osdata * +std::unique_ptr get_osdata (const char *type) { - struct osdata *osdata = NULL; - char *xml = target_get_osdata (type); + std::unique_ptr osdata; + gdb::optional xml = target_get_osdata (type); if (xml) { - struct cleanup *old_chain = make_cleanup (xfree, xml); - - if (xml[0] == '\0') + if ((*xml)[0] == '\0') { if (type) warning (_("Empty data returned by target. Wrong osdata type?")); @@ -259,72 +174,57 @@ get_osdata (const char *type) warning (_("Empty type list returned by target. No type data?")); } else - osdata = osdata_parse (xml); - - do_cleanups (old_chain); + osdata = osdata_parse (xml->data ()); } - if (!osdata) + if (osdata == NULL) error (_("Can not fetch data now.")); return osdata; } -const char * -get_osdata_column (struct osdata_item *item, const char *name) +const std::string * +get_osdata_column (const osdata_item &item, const char *name) { - struct osdata_column *col; - int ix_cols; - - for (ix_cols = 0; - VEC_iterate (osdata_column_s, item->columns, - ix_cols, col); - ix_cols++) - if (strcmp (col->name, name) == 0) - return col->value; + for (const osdata_column &col : item.columns) + if (col.name == name) + return &col.value; return NULL; } void -info_osdata_command (char *type, int from_tty) +info_osdata (const char *type) { struct ui_out *uiout = current_uiout; - struct osdata *osdata = NULL; struct osdata_item *last = NULL; - 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); + if (type == NULL) + type = ""; + + std::unique_ptr osdata = get_osdata (type); - nrows = VEC_length (osdata_item_s, osdata->items); + int nrows = osdata->items.size (); - 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)) + if (!osdata->items.empty ()) { - last = VEC_last (osdata_item_s, osdata->items); - if (last->columns) - ncols = VEC_length (osdata_column_s, last->columns); + last = &osdata->items.back (); + ncols = last->columns.size (); /* 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)) + 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++) + for (int ix = 0; ix < last->columns.size (); ix++) { - if (strcmp (col->name, "Title") == 0) + if (last->columns[ix].name == "Title") col_to_skip = ix; } /* Be sure to reduce the total column count, otherwise @@ -334,26 +234,16 @@ info_osdata_command (char *type, int from_tty) } } - 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. */ if (ncols == 0) - { - do_cleanups (old_chain); - return; - } + return; - if (last && last->columns) + if (last != NULL && !last->columns.empty ()) { - struct osdata_column *col; - int ix; - - for (ix = 0; - VEC_iterate (osdata_column_s, last->columns, - ix, col); - ix++) + for (int ix = 0; ix < last->columns.size (); ix++) { char col_name[32]; @@ -361,53 +251,43 @@ info_osdata_command (char *type, int from_tty) continue; snprintf (col_name, 32, "col%d", ix); - ui_out_table_header (uiout, 10, ui_left, - col_name, col->name); + uiout->table_header (10, ui_left, + col_name, last->columns[ix].name.c_str ()); } } - ui_out_table_body (uiout); + uiout->table_body (); if (nrows != 0) { - struct osdata_item *item; - int ix_items; - - for (ix_items = 0; - VEC_iterate (osdata_item_s, osdata->items, - ix_items, item); - ix_items++) + for (const osdata_item &item : osdata->items) { - struct cleanup *old_chain; - int ix_cols; - struct osdata_column *col; - - old_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "item"); + { + 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]; + for (int ix_cols = 0; ix_cols < item.columns.size (); ix_cols++) + { + char col_name[32]; - if (ix_cols == col_to_skip) - continue; + if (ix_cols == col_to_skip) + continue; - snprintf (col_name, 32, "col%d", ix_cols); - ui_out_field_string (uiout, col_name, col->value); - } - - do_cleanups (old_chain); + snprintf (col_name, 32, "col%d", ix_cols); + uiout->field_string (col_name, + item.columns[ix_cols].value.c_str ()); + } + } - ui_out_text (uiout, "\n"); + uiout->text ("\n"); } } - - do_cleanups (old_chain); } -extern initialize_file_ftype _initialize_osdata; /* -Wmissing-prototypes */ +static void +info_osdata_command (const char *arg, int from_tty) +{ + info_osdata (arg); +} void _initialize_osdata (void)