aboutsummaryrefslogtreecommitdiff
path: root/gdb/ui-out.c
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2016-11-30 21:41:46 -0500
committerSimon Marchi <simon.marchi@polymtl.ca>2016-11-30 21:41:46 -0500
commit5486f16481dffa1c1a0d1fd9e38b97e3678078ed (patch)
tree611960588a1a7b491804f07f3fb10a2597ba45b8 /gdb/ui-out.c
parent5084b13657023904cb60737abdf4cefb539a5fc4 (diff)
downloadgdb-5486f16481dffa1c1a0d1fd9e38b97e3678078ed.zip
gdb-5486f16481dffa1c1a0d1fd9e38b97e3678078ed.tar.gz
gdb-5486f16481dffa1c1a0d1fd9e38b97e3678078ed.tar.bz2
Use new/delete instead of malloc/free-based functions
The following patches introduce C++ vectors and strings as fields of the various ui_out structures. We therefore need to use new/delete so that their contructor/destructor is called. I find it simpler to change all the allocations in a separate preliminary patch, rather than in each individual patch. gdb/ChangeLog: * cli-out.c (cli_uiout_dtor): Use delete instead of xfree. (cli_out_new): Use new instead of XNEW. * mi/mi-out.c (mi_out_data_dtor): Use delete instead of xfree. (mi_out_new): Use new instead of XNEW. * tui/tui-out.c (tui_out_new): Likewise. * ui-out.c (push_level): Likewise. (pop_level): Use delete instead of xfree. (clear_header_list): Use delete instead of xfree. (append_header_to_list): Use new instead of XNEW. (ui_out_new): Likewise.
Diffstat (limited to 'gdb/ui-out.c')
-rw-r--r--gdb/ui-out.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index b8253c9..bb37ece 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -120,7 +120,7 @@ push_level (struct ui_out *uiout,
struct ui_out_level *current;
uiout->level++;
- current = XNEW (struct ui_out_level);
+ current = new ui_out_level ();
current->field_count = 0;
current->type = type;
VEC_safe_push (ui_out_level_p, uiout->levels, current);
@@ -139,7 +139,7 @@ pop_level (struct ui_out *uiout,
gdb_assert (uiout->level > 0);
gdb_assert (current_level (uiout)->type == type);
current = VEC_pop (ui_out_level_p, uiout->levels);
- xfree (current);
+ delete current;
uiout->level--;
return uiout->level + 1;
}
@@ -708,8 +708,9 @@ clear_header_list (struct ui_out *uiout)
uiout->table.header_first = uiout->table.header_first->next;
xfree (uiout->table.header_next->colhdr);
xfree (uiout->table.header_next->col_name);
- xfree (uiout->table.header_next);
+ delete uiout->table.header_next;
}
+
gdb_assert (uiout->table.header_first == NULL);
uiout->table.header_last = NULL;
uiout->table.header_next = NULL;
@@ -724,7 +725,7 @@ append_header_to_list (struct ui_out *uiout,
{
struct ui_out_hdr *temphdr;
- temphdr = XNEW (struct ui_out_hdr);
+ temphdr = new ui_out_hdr ();
temphdr->width = width;
temphdr->alignment = alignment;
/* We have to copy the column title as the original may be an
@@ -859,8 +860,8 @@ struct ui_out *
ui_out_new (const struct ui_out_impl *impl, void *data,
int flags)
{
- struct ui_out *uiout = XNEW (struct ui_out);
- struct ui_out_level *current = XNEW (struct ui_out_level);
+ struct ui_out *uiout = new ui_out ();
+ struct ui_out_level *current = new ui_out_level ();
uiout->data = data;
uiout->impl = impl;