[PATCH 03/22] Remove ui_out_destroy

Simon Marchi
2016-11-24T15:24:35Z

It's not actually used, and removing it simplifies the upcoming patches
a bit. After the whole series, destroying an ui_out object will be
simply "delete uiout", which will call the default destructor.

gdb/ChangeLog:

* ui-out.c (ui_out_destroy, uo_data_destroy): Remove.
* ui-out.h (ui_out_destroy): Remove.
---
gdb/ui-out.c | 32 --------------------------------
gdb/ui-out.h | 4 ----
2 files changed, 36 deletions(-)

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 249d059..9ac22dd 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -177,7 +177,6 @@ static void uo_message (struct ui_out *uiout, int verbosity,
static void uo_wrap_hint (struct ui_out *uiout, char *identstring);
static void uo_flush (struct ui_out *uiout);
static int uo_redirect (struct ui_out *uiout, struct ui_file *outstream);
-static void uo_data_destroy (struct ui_out *uiout);

/* Prototypes for local functions */

@@ -710,15 +709,6 @@ uo_redirect (struct ui_out *uiout, struct ui_file *outstream)
return 0;
}

-void
-uo_data_destroy (struct ui_out *uiout)
-{
- if (!uiout->impl->data_destroy)
- return;
-
- uiout->impl->data_destroy (uiout);
-}
-
/* local functions */

/* List of column headers manipulation routines. */
@@ -905,25 +895,3 @@ ui_out_new (const struct ui_out_impl *impl, void *data,
uiout->table.header_next = NULL;
return uiout;
}
-
-/* Free UIOUT and the memory areas it references. */
-
-void
-ui_out_destroy (struct ui_out *uiout)
-{
- int i;
- struct ui_out_level *current;
-
- /* Make sure that all levels are freed in the case where levels have
- been pushed, but not popped before the ui_out object is
- destroyed. */
- for (i = 0;
- VEC_iterate (ui_out_level_p, uiout->levels, i, current);
- ++i)
- xfree (current);
-
- VEC_free (ui_out_level_p, uiout->levels);
- uo_data_destroy (uiout);
- clear_table (uiout);
- xfree (uiout);
-}
diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index a5e693c..a76dfe8 100644
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -231,10 +231,6 @@ extern struct ui_out *ui_out_new (const struct ui_out_impl *impl,
void *data,
int flags);

-/* Destroy a ui_out object. */
-
-extern void ui_out_destroy (struct ui_out *uiout);
-
/* Redirect the ouptut of a ui_out object temporarily. */

extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream);
--
2.10.0