2000-02-03 05:14:45 +01:00
|
|
|
/* Output generating routines for GDB CLI.
|
2002-03-19 03:51:09 +01:00
|
|
|
|
2010-01-01 08:32:07 +01:00
|
|
|
Copyright (C) 1999, 2000, 2002, 2003, 2005, 2007, 2008, 2009, 2010
|
From Kaveh R. Ghazi <ghazi@caip.rutgers.edu>:
gdb/
* cli-out.c (cli_field_fmt, cli_message, out_field_fmt): Add
ATTR_FORMAT or ATTRIBUTE_FPTR_PRINTF.
* complaints.c (vcomplaint): Likewise.
* defs.h (xvasprintf, xstrvprintf, verror, vfatal)
(internal_verror, internal_vwarning, vwarning)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_readline_begin_hook): Likewise.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (throw_verror, throw_vfatal): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* tui/tui-out.c (tui_field_fmt, tui_message, out_field_fmt):
Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message, field_fmt_ftype)
(message_ftype): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem)
(defaulted_query, printchar): Likewise.
gdb/gdbserver/
* server.h (error, fatal, warning): Add ATTR_FORMAT.
2005-07-31 22:56:26 +02:00
|
|
|
Free Software Foundation, Inc.
|
2002-03-19 03:51:09 +01:00
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
Contributed by Cygnus Solutions.
|
|
|
|
Written by Fernando Nasser for Cygnus.
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-23 20:08:50 +02:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2000-02-03 05:14:45 +01:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 20:08:50 +02:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "ui-out.h"
|
|
|
|
#include "cli-out.h"
|
2000-03-30 21:52:35 +02:00
|
|
|
#include "gdb_string.h"
|
2001-06-19 22:30:11 +02:00
|
|
|
#include "gdb_assert.h"
|
2000-02-03 05:14:45 +01:00
|
|
|
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
typedef struct cli_ui_out_data cli_out_data;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void cli_text (struct ui_out *uiout, const char *string);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
static void field_separator (void);
|
|
|
|
|
2001-06-10 02:22:41 +02:00
|
|
|
static void out_field_fmt (struct ui_out *uiout, int fldno,
|
|
|
|
const char *fldname,
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 23:14:59 +02:00
|
|
|
const char *format,...) ATTRIBUTE_PRINTF (4, 5);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
/* These are the CLI output functions */
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
/* Mark beginning of a table */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2001-06-10 02:22:41 +02:00
|
|
|
cli_table_begin (struct ui_out *uiout, int nbrofcols,
|
2001-06-19 18:19:16 +02:00
|
|
|
int nr_rows,
|
2001-06-10 02:22:41 +02:00
|
|
|
const char *tblid)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (nr_rows == 0)
|
|
|
|
data->suppress_output = 1;
|
|
|
|
else
|
Index: mi/ChangeLog
2003-10-24 Andrew Cagney <cagney@redhat.com>
* tui-out.c: Fix "fortunatly"[sic].
Index: doc/ChangeLog
2003-10-24 Andrew Cagney <cagney@redhat.com>
* annotate.texinfo: Fix "fortunatly"[sic].
2003-10-24 Andrew Cagney <cagney@redhat.com>
* osabi.c (gdbarch_init_osabi): Fix typos, and "fortunatly"[sic].
* PROBLEMS, arch-utils.c, cli-out.c, command.h: Ditto.
* complaints.c, cris-tdep.c, disasm.c, dwarf2-frame.c: Ditto.
* frame.c, frame.h, infcall.c, infcmd.c, infrun.c: Ditto.
* kod.c, mips-tdep.c, regcache.c, regcache.h, remote.c: Ditto.
2003-10-24 19:37:04 +02:00
|
|
|
/* Only the table suppresses the output and, fortunately, a table
|
2005-01-14 00:39:40 +01:00
|
|
|
is not a recursive data structure. */
|
2001-06-19 22:30:11 +02:00
|
|
|
gdb_assert (data->suppress_output == 0);
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark beginning of a table body */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_table_body (struct ui_out *uiout)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
/* first, close the table header line */
|
|
|
|
cli_text (uiout, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark end of a table */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_table_end (struct ui_out *uiout)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
data->suppress_output = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Specify table header */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
|
2001-06-21 17:39:54 +02:00
|
|
|
const char *col_name,
|
2001-06-10 02:22:41 +02:00
|
|
|
const char *colhdr)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
|
|
We may have been extended. */
|
|
|
|
uo_field_string (uiout, 0, width, alignment, 0, colhdr);
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark beginning of a list */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2001-05-09 03:33:10 +02:00
|
|
|
cli_begin (struct ui_out *uiout,
|
|
|
|
enum ui_out_type type,
|
|
|
|
int level,
|
|
|
|
const char *id)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark end of a list */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2001-05-09 03:33:10 +02:00
|
|
|
cli_end (struct ui_out *uiout,
|
|
|
|
enum ui_out_type type,
|
|
|
|
int level)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* output an int field */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_field_int (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 02:22:41 +02:00
|
|
|
enum ui_align alignment,
|
|
|
|
const char *fldname, int value)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
|
|
|
char buffer[20]; /* FIXME: how many chars long a %d can become? */
|
|
|
|
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
sprintf (buffer, "%d", value);
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
|
|
We may have been extended. */
|
|
|
|
uo_field_string (uiout, fldno, width, alignment, fldname, buffer);
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* used to ommit a field */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_field_skip (struct ui_out *uiout, int fldno, int width,
|
2001-06-10 02:22:41 +02:00
|
|
|
enum ui_align alignment,
|
|
|
|
const char *fldname)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
|
|
We may have been extended. */
|
|
|
|
uo_field_string (uiout, fldno, width, alignment, fldname, "");
|
2000-02-03 05:14:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* other specific cli_field_* end up here so alignment and field
|
|
|
|
separators are both handled by cli_field_string */
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-02-03 05:14:45 +01:00
|
|
|
cli_field_string (struct ui_out *uiout,
|
|
|
|
int fldno,
|
|
|
|
int width,
|
2000-02-20 19:23:31 +01:00
|
|
|
enum ui_align align,
|
2001-06-10 02:22:41 +02:00
|
|
|
const char *fldname,
|
2000-02-03 05:14:45 +01:00
|
|
|
const char *string)
|
|
|
|
{
|
|
|
|
int before = 0;
|
|
|
|
int after = 0;
|
|
|
|
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
if ((align != ui_noalign) && string)
|
|
|
|
{
|
|
|
|
before = width - strlen (string);
|
|
|
|
if (before <= 0)
|
|
|
|
before = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (align == ui_right)
|
|
|
|
after = 0;
|
|
|
|
else if (align == ui_left)
|
|
|
|
{
|
|
|
|
after = before;
|
|
|
|
before = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* ui_center */
|
|
|
|
{
|
|
|
|
after = before / 2;
|
|
|
|
before -= after;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (before)
|
|
|
|
ui_out_spaces (uiout, before);
|
|
|
|
if (string)
|
|
|
|
out_field_fmt (uiout, fldno, fldname, "%s", string);
|
|
|
|
if (after)
|
|
|
|
ui_out_spaces (uiout, after);
|
|
|
|
|
|
|
|
if (align != ui_noalign)
|
|
|
|
field_separator ();
|
|
|
|
}
|
|
|
|
|
2005-01-14 00:39:40 +01:00
|
|
|
/* This is the only field function that does not align. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 23:14:59 +02:00
|
|
|
static void ATTRIBUTE_PRINTF (6, 0)
|
2000-02-03 05:14:45 +01:00
|
|
|
cli_field_fmt (struct ui_out *uiout, int fldno,
|
|
|
|
int width, enum ui_align align,
|
2001-06-10 02:22:41 +02:00
|
|
|
const char *fldname,
|
|
|
|
const char *format,
|
|
|
|
va_list args)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
vfprintf_filtered (data->stream, format, args);
|
|
|
|
|
|
|
|
if (align != ui_noalign)
|
|
|
|
field_separator ();
|
|
|
|
}
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_spaces (struct ui_out *uiout, int numspaces)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
print_spaces_filtered (numspaces, data->stream);
|
|
|
|
}
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2001-06-10 02:22:41 +02:00
|
|
|
cli_text (struct ui_out *uiout, const char *string)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
fputs_filtered (string, data->stream);
|
|
|
|
}
|
|
|
|
|
gdb/
* ada-lang.c (lim_warning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* amd64-tdep.c (amd64_insn_length_fprintf): Likewise.
* cli-out.c (cli_field_fmt): New ATTRIBUTE_PRINTF.
(cli_message, out_field_fmt): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.c (find_complaint): New ATTRIBUTE_PRINTF.
(vcomplaint): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* complaints.h (complaint, internal_complaint): Likewise.
* defs.h: Change ATTR_FORMAT to ATTRIBUTE_PRINTF in the top comment.
(ATTR_FORMAT): Remove.
(query, nquery, yquery, vprintf_filtered, vfprintf_filtered)
(fprintf_filtered, fprintfi_filtered, printf_filtered, printfi_filtered)
(vprintf_unfiltered, vfprintf_unfiltered, fprintf_unfiltered)
(printf_unfiltered, xasprintf, xvasprintf, xstrprintf, xstrvprintf)
(xsnprintf, verror, error, vfatal, fatal, internal_verror)
(internal_error, internal_vwarning, internal_warning, warning)
(vwarning): Change ATTR_FORMAT to ATTRIBUTE_PRINTF.
* disasm.c (fprintf_disasm): Likewise.
* exceptions.c (throw_it): Likewise.
* exceptions.h (exception_fprintf, throw_verror, throw_vfatal)
(throw_error): Likewise.
* language.h (type_error, range_error): Likewise.
* linespec.c (cplusplus_error): Likewise.
* mi/mi-interp.c (mi_interp_query_hook): Likewise.
* mi/mi-out.c (mi_field_fmt, mi_message): Likewise.
* monitor.c (monitor_debug): Likewise.
* parser-defs.h (parser_fprintf): Likewise.
* serial.h (serial_printf): Likewise.
* tui/tui-hooks.c (tui_query_hook): Likewise.
* ui-out.c (default_field_fmt, default_message, uo_field_fmt)
(uo_message): Likewise.
* ui-out.h (ui_out_field_fmt, ui_out_message): Likewise.
* utils.c (vfprintf_maybe_filtered, internal_vproblem, defaulted_query):
Likewise.
* xml-support.h (gdb_xml_debug, gdb_xml_error): Likewise.
2010-05-02 23:14:59 +02:00
|
|
|
static void ATTRIBUTE_PRINTF (3, 0)
|
2001-06-10 02:22:41 +02:00
|
|
|
cli_message (struct ui_out *uiout, int verbosity,
|
|
|
|
const char *format, va_list args)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
if (ui_out_get_verblvl (uiout) >= verbosity)
|
|
|
|
vfprintf_unfiltered (data->stream, format, args);
|
|
|
|
}
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_wrap_hint (struct ui_out *uiout, char *identstring)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2001-06-19 22:30:11 +02:00
|
|
|
if (data->suppress_output)
|
|
|
|
return;
|
2000-02-03 05:14:45 +01:00
|
|
|
wrap_here (identstring);
|
|
|
|
}
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
cli_flush (struct ui_out *uiout)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
gdb_flush (data->stream);
|
|
|
|
}
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
static int
|
2003-06-28 18:19:07 +02:00
|
|
|
cli_redirect (struct ui_out *uiout, struct ui_file *outstream)
|
|
|
|
{
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2003-06-28 18:19:07 +02:00
|
|
|
if (outstream != NULL)
|
|
|
|
{
|
|
|
|
data->original_stream = data->stream;
|
|
|
|
data->stream = outstream;
|
|
|
|
}
|
|
|
|
else if (data->original_stream != NULL)
|
|
|
|
{
|
|
|
|
data->stream = data->original_stream;
|
|
|
|
data->original_stream = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
/* local functions */
|
|
|
|
|
|
|
|
/* Like cli_field_fmt, but takes a variable number of args
|
2005-01-14 00:39:40 +01:00
|
|
|
and makes a va_list and does not insert a separator. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
/* VARARGS */
|
|
|
|
static void
|
2001-06-10 02:22:41 +02:00
|
|
|
out_field_fmt (struct ui_out *uiout, int fldno,
|
|
|
|
const char *fldname,
|
|
|
|
const char *format,...)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start (args, format);
|
|
|
|
vfprintf_filtered (data->stream, format, args);
|
|
|
|
|
|
|
|
va_end (args);
|
|
|
|
}
|
|
|
|
|
2005-01-14 00:39:40 +01:00
|
|
|
/* Access to ui_out format private members. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
field_separator (void)
|
2000-02-03 05:14:45 +01:00
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
fputc_filtered (' ', data->stream);
|
|
|
|
}
|
|
|
|
|
* cli-out.c (cli_table_begin, cli_table_body, cli_table_end)
(cli_table_header, cli_begin, cli_end, cli_field_int)
(cli_field_skip, cli_field_string, cli_field_fmt, cli_spaces)
(cli_text, cli_message, cli_wrap_hint, cli_flush, cli_redirect):
Delete forward declarations.
(cli_ui_out_impl): Move below the callbacks.
(_initialize_cli_out): Delete.
2010-05-02 18:50:02 +02:00
|
|
|
/* 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 =
|
|
|
|
{
|
|
|
|
cli_table_begin,
|
|
|
|
cli_table_body,
|
|
|
|
cli_table_end,
|
|
|
|
cli_table_header,
|
|
|
|
cli_begin,
|
|
|
|
cli_end,
|
|
|
|
cli_field_int,
|
|
|
|
cli_field_skip,
|
|
|
|
cli_field_string,
|
|
|
|
cli_field_fmt,
|
|
|
|
cli_spaces,
|
|
|
|
cli_text,
|
|
|
|
cli_message,
|
|
|
|
cli_wrap_hint,
|
|
|
|
cli_flush,
|
|
|
|
cli_redirect,
|
|
|
|
0, /* Does not need MI hacks (i.e. needs CLI hacks). */
|
|
|
|
};
|
|
|
|
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
/* Constructor for a `cli_out_data' object. */
|
|
|
|
|
|
|
|
void
|
|
|
|
cli_out_data_ctor (cli_out_data *self, struct ui_file *stream)
|
|
|
|
{
|
|
|
|
self->stream = stream;
|
|
|
|
self->original_stream = NULL;
|
|
|
|
self->suppress_output = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize private members at startup. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
struct ui_out *
|
|
|
|
cli_out_new (struct ui_file *stream)
|
|
|
|
{
|
|
|
|
int flags = ui_source_list;
|
|
|
|
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = XMALLOC (cli_out_data);
|
PR tui/9217
* tui/tui-out.c: Include cli-out.h.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end, tui_field_int, tui_field_skip)
(tui_field_string, tui_field_fmt, tui_spaces, tui_text)
(tui_message, tui_wrap_hint, tui_flush): Delete forward
declarations.
(struct ui_out_data): Rename to...
(struct tui_ui_out_data): ... this. Remove `stream' and
`suppress_output' fields, and inherit cli_ui_out_data.
(tui_out_data): New typedef.
(tui_ui_out_impl): Don't initialize fields staticaly.
(tui_table_begin, tui_table_body, tui_table_end, tui_table_header)
(tui_begin, tui_end): Delete.
(tui_field_int): Adjust to delegate most work to the base type.
(tui_field_skip): Delete.
(tui_field_string, tui_field_fmt): Adjust comment. Adjust to
delegate most work to the base type.
(tui_spaces): Delete.
(tui_text): Adjust to delegate most work to the base type.
(tui_message): Delete.
(tui_wrap_hint): Delete.
(tui_flush): Delete.
(out_field_fmt): Delete.
(field_separator): Delete.
(tui_out_new): Adjust to initialize the base type.
(_initialize_tui_out): Initialize tui_ui_out_impl.
* cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed
cli_ui_out_data.
(cli_out_data): Adjust.
(cli_ui_out_impl): Make extern.
(cli_table_header, cli_field_int, cli_field_skip): Use
uo_field_string instead of cli_field_string.
(cli_redirect): Adjust to use cli_out_data.
(cli_out_data_ctor): New.
(cli_out_new): Use it.
* cli-out.h (struct ui_file): Remove forward declaration.
(struct cli_ui_out_data): New, moved from cli-out.c, and renamed.
(cli_ui_out_impl): Declare.
(cli_out_data_ctor): Declare.
* ui-out.c (struct ui_out) <data>: Change type to void pointer.
(uo_field_string): No longer static.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
* ui-out.h (struct ui_out_data): Don't forward declare.
(ui_out_data): Change return type to void pointer.
(ui_out_new): Change `data' parameter type to void pointer.
(uo_field_string): Declare.
2010-04-18 02:11:55 +02:00
|
|
|
cli_out_data_ctor (data, stream);
|
2000-02-03 05:14:45 +01:00
|
|
|
return ui_out_new (&cli_ui_out_impl, data, flags);
|
|
|
|
}
|
|
|
|
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
struct ui_file *
|
|
|
|
cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream)
|
|
|
|
{
|
2003-03-08 21:04:27 +01:00
|
|
|
cli_out_data *data = ui_out_data (uiout);
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
struct ui_file *old = data->stream;
|
|
|
|
data->stream = stream;
|
|
|
|
return old;
|
|
|
|
}
|