/* Output generating routines for GDB CLI.
- Copyright (C) 1999-2000, 2002-2003, 2005, 2007-2012 Free Software
- Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
#include "defs.h"
#include "ui-out.h"
#include "cli-out.h"
-#include "gdb_string.h"
+#include <string.h>
#include "gdb_assert.h"
#include "vec.h"
const char *fldname,
const char *format,...) ATTRIBUTE_PRINTF (4, 5);
+/* The destructor. */
+
+static void
+cli_uiout_dtor (struct ui_out *ui_out)
+{
+ cli_out_data *data = ui_out_data (ui_out);
+
+ VEC_free (ui_filep, data->streams);
+ xfree (data);
+}
+
/* These are the CLI output functions */
/* Mark beginning of a table */
if (data->suppress_output)
return;
- sprintf (buffer, "%d", value);
+ xsnprintf (buffer, sizeof (buffer), "%d", value);
/* Always go through the function pointer (virtual function call).
We may have been extended. */
/* This is the CLI ui-out implementation functions vector */
-/* FIXME: This can be initialized dynamically after default is set to
- handle initial output in main.c */
-
-struct ui_out_impl cli_ui_out_impl =
+const struct ui_out_impl cli_ui_out_impl =
{
cli_table_begin,
cli_table_body,
cli_wrap_hint,
cli_flush,
cli_redirect,
+ cli_uiout_dtor,
0, /* Does not need MI hacks (i.e. needs CLI hacks). */
};
cli_out_new (struct ui_file *stream)
{
int flags = ui_source_list;
- cli_out_data *data = XMALLOC (cli_out_data);
+ cli_out_data *data = XNEW (cli_out_data);
cli_out_data_ctor (data, stream);
return ui_out_new (&cli_ui_out_impl, data, flags);