2000-02-03 05:14:45 +01:00
|
|
|
/* Output generating routines for GDB.
|
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
|
|
|
|
2011-01-01 16:34:07 +01:00
|
|
|
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010,
|
|
|
|
2011 Free Software Foundation, Inc.
|
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
|
|
|
|
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
|
|
|
|
|
|
|
#ifndef UI_OUT_H
|
|
|
|
#define UI_OUT_H 1
|
|
|
|
|
|
|
|
/* The ui_out structure */
|
|
|
|
|
|
|
|
struct ui_out;
|
2003-07-18 21:01:14 +02:00
|
|
|
struct ui_file;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
/* the current ui_out */
|
|
|
|
|
|
|
|
/* FIXME: This should not be a global but something passed down from main.c
|
2011-01-12 02:23:29 +01:00
|
|
|
or top.c. */
|
2000-02-03 05:14:45 +01:00
|
|
|
extern struct ui_out *uiout;
|
|
|
|
|
|
|
|
/* alignment enum */
|
|
|
|
enum ui_align
|
|
|
|
{
|
|
|
|
ui_left = -1,
|
|
|
|
ui_center,
|
|
|
|
ui_right,
|
|
|
|
ui_noalign
|
|
|
|
};
|
|
|
|
|
|
|
|
/* flags enum */
|
|
|
|
enum ui_flags
|
|
|
|
{
|
|
|
|
ui_from_tty = 1,
|
|
|
|
ui_source_list = 2
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
/* The ui_out stream structure. */
|
2000-02-03 05:14:45 +01:00
|
|
|
/* NOTE: cagney/2000-02-01: The ui_stream object can be subsumed by
|
|
|
|
the more generic ui_file object. */
|
|
|
|
|
|
|
|
struct ui_stream
|
|
|
|
{
|
|
|
|
struct ui_out *uiout;
|
|
|
|
struct ui_file *stream;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
/* Prototypes for ui-out API. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2001-05-09 03:33:10 +02:00
|
|
|
/* A result is a recursive data structure consisting of lists and
|
2011-01-12 02:23:29 +01:00
|
|
|
tuples. */
|
2001-05-09 03:33:10 +02:00
|
|
|
|
|
|
|
enum ui_out_type
|
|
|
|
{
|
2001-05-12 06:08:24 +02:00
|
|
|
ui_out_type_tuple,
|
2001-05-09 03:33:10 +02:00
|
|
|
ui_out_type_list
|
|
|
|
};
|
|
|
|
|
|
|
|
extern void ui_out_begin (struct ui_out *uiout,
|
|
|
|
enum ui_out_type level_type,
|
|
|
|
const char *id);
|
|
|
|
|
|
|
|
extern void ui_out_end (struct ui_out *uiout, enum ui_out_type type);
|
|
|
|
|
2001-05-10 23:30:37 +02:00
|
|
|
extern struct cleanup *ui_out_begin_cleanup_end (struct ui_out *uiout,
|
|
|
|
enum ui_out_type level_type,
|
|
|
|
const char *id);
|
|
|
|
|
2001-06-19 18:19:16 +02:00
|
|
|
/* A table can be considered a special tuple/list combination with the
|
|
|
|
implied structure: ``table = { hdr = { header, ... } , body = [ {
|
2011-01-12 02:23:29 +01:00
|
|
|
field, ... }, ... ] }''. If NR_ROWS is negative then there is at
|
|
|
|
least one row. */
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_table_header (struct ui_out *uiout, int width,
|
2001-06-21 17:39:54 +02:00
|
|
|
enum ui_align align, const char *col_name,
|
|
|
|
const char *colhdr);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_table_body (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
extern struct cleanup *make_cleanup_ui_out_table_begin_end (struct ui_out *ui_out,
|
|
|
|
int nr_cols,
|
2011-01-05 23:22:53 +01:00
|
|
|
int nr_rows,
|
|
|
|
const char *tblid);
|
2001-06-12 18:44:36 +02:00
|
|
|
/* Compatibility wrappers. */
|
2001-05-09 03:33:10 +02:00
|
|
|
|
2001-06-12 18:44:36 +02:00
|
|
|
extern struct cleanup *make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
|
|
|
|
const char *id);
|
2001-05-12 06:08:24 +02:00
|
|
|
|
|
|
|
extern struct cleanup *make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
|
|
|
|
const char *id);
|
2001-01-27 18:57:53 +01:00
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_field_int (struct ui_out *uiout, const char *fldname,
|
|
|
|
int value);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2002-10-04 00:34:58 +02:00
|
|
|
extern void ui_out_field_fmt_int (struct ui_out *uiout, int width,
|
|
|
|
enum ui_align align, const char *fldname,
|
|
|
|
int value);
|
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_field_core_addr (struct ui_out *uiout, const char *fldname,
|
* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter.
* utils.c (strlen_paddr, paddr, paddr_nz): Remove.
(paddress): Add GDBARCH parameter, use it instead of current_gdbarch.
* ui-out.h (ui_out_field_core_addr): Add GDBARCH parameter.
* ui-out.c (ui_out_field_core_addr): Add GDBARCH parameter,
use it instead of current_gdbarch.
Update calls to ui_out_field_core_addr to pass architecture:
* ada-lang.c (print_one_exception): Update.
* breakpoint.c (print_one_breakpoint_location,
print_one_exception_catchpoint): Update.
* disasm.c (dump_insns): Update.
* darwin-nat-info.c (darwin_debug_regions_recurse): Update.
* mi/mi-main.c (mi_cmd_data_read_memory): Update.
* mi/mi-symbol-cmds.c: Include "objfiles.h".
(mi_cmd_symbol_list_lines): Update.
* stack.c (print_frame_info, print_frame): Update.
Update callers of paddress to pass architecture:
* ada-tasks.c (info_task): Update.
* ada-valprint.c (ada_val_print_1): Update.
* annotate.c (annotate_source, annotate_frame_begin): Update.
* breakpoint.c (insert_bp_location, describe_other_breakpoints,
mention): Update.
* cli/cli-cmds.c (edit_command, list_command, print_disassembly):
Update.
* corefile.c (memory_error): Update.
* c-valprint.c (print_function_pointer_address, c_val_print): Update.
* disasm.c (dis_asm_print_address): Update.
* exec.c (print_section_info): Update.
* f-valprint.c (f_val_print): Update.
* infcmd.c: Include "arch-utils.h".
(jump_command, program_info): Update.
* linux-fork.c: Include "arch-utils.h".
(info_forks_command): Update.
* m2-valprint.c (print_function_pointer_address,
print_unpacked_pointer, print_variable_at_address,
m2_val_print): Update.
* m32r-rom.c (m32r_load_section, m32r_load, m32r_upload_command):
Update.
* printcmd.c (print_address, print_address_demangle, address_info):
Update.
* p-valprint.c (pascal_val_print): Update.
* source.c: Include "arch-utils.h".
(line_info): Update.
* stack.c (frame_info, print_block_frame_labels): Update.
* symfile.c (add_symbol_file_command, list_overlays_command): Update.
* symmisc.c (dump_msymbols, dump_psymtab, dump_symtab_1,
print_symbol, print_partial_symbols, maintenance_info_psymtabs,
maintenance_check_symtabs): Update.
* symtab.c (find_pc_sect_symtab): Update.
* target.c (deprecated_debug_xfer_memory): Update.
* tracepoint.c (scope_info): Update.
* tui/tui-stack.c (tui_make_status_line): Update.
* valprint.c (val_print_string): Update.
Update callers of paddr_nz to use paddress instead (keeping
user-visible output identical):
* alpha-tdep.c (alpha_heuristic_proc_start): Update.
* amd64-tdep.c (fixup_riprel, amd64_displaced_step_copy_insn,
amd64_displaced_step_fixup): Update.
* arch-utils.c (simple_displaced_step_copy_insn): Update.
* auxv.c (fprint_target_auxv): Update.
* breakpoint.c (insert_single_step_breakpoint): Update.
* buildsym.c (finish_block): Update.
* cli/cli-dump.c (restore_section_callback): Update.
* fbsd-nat.c (fbsd_find_memory_regions): Update.
* frame.c (frame_unwind_register_value): Update.
* gcore.c (gcore_create_callback): Update.
* hppa-tdep.c (hppa_frame_cache, hppa_skip_trampoline_code): Update.
* i386-tdep.c (i386_displaced_step_fixup, i386_record_modrm,
i386_record_lea_modrm_addr, i386_record_lea_modrm,
i386_process_record): Update.
* ia64-tdep.c (ia64_frame_this_id, ia64_sigtramp_frame_this_id,
ia64_libunwind_frame_this_id, ia64_libunwind_sigtramp_frame_this_id,
ia64_dummy_id, ia64_access_reg, ia64_access_rse_reg): Update.
* infrun.c (displaced_step_prepare, displaced_step_fixup,
handle_inferior_event, insert_step_resume_breakpoint_at_sal,
insert_longjmp_resume_breakpoint): Update.
* linux-nat.c (linux_nat_find_memory_regions): Update.
* linux-record.c (record_linux_system_call): Update.
* mips-tdep.c (heuristic_proc_start, mips_eabi_push_dummy_call,
mips_n32n64_push_dummy_call, mips_o32_push_dummy_call,
mips_o64_push_dummy_call): Update.
* monitor.c (monitor_error, monitor_remove_breakpoint): Update.
* record.c (record_arch_list_add_mem, record_wait,
record_xfer_partial): Update.
* remote-mips.c (mips_fetch_word, mips_check_lsi_error,
mips_common_breakpoint): Update.
* remote-sim.c (gdbsim_xfer_inferior_memory): Update.
* rs6000-tdep.c (ppc_displaced_step_fixup): Update.
* solib-som.c (som_current_sos): Update.
* symfile.c (load_progress, generic_load): Update.
* symfile-mem.c (add_vsyscall_page): Update.
* valops.c (value_fetch_lazy): Update.
* windows-tdep.c (windows_xfer_shared_library): Update.
Update callers of paddr_nz to use paddress instead (changing
user-visible output to make it more correct):
* dwarf2loc.c (locexpr_describe_location): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint,
ia64_memory_remove_breakpoint): Update.
* jv-valprint.c (java_value_print): Update.
* m32c-tdep.c (m32c_m16c_address_to_pointer): Update.
* monitor.c (monitor_read_memory): Update.
Update callers of paddr to use paddress instead (changing
user-visible output to make it more correct):
* arm-tdep.c (arm_push_dummy_call): Update.
* breakpoint.c (insert_bp_location, create_thread_event_breakpoint,
create_breakpoint): Update.
* darwin-nat-info.c (darwin_debug_regions): Update.
* dcache.c (dcache_info): Update.
* dsrec.c (load_srec, make_srec): Update.
* dwarf2-frame.c (dwarf2_restore_rule, execute_cfa_program,
dwarf2_frame_cache): Update.
* gcore.c (gcore_copy_callback): Update.
* gnu-nat.c (gnu_xfer_memory): Update.
* mips-linux-nat.c (mips_show_dr): Update.
* monitor.c (monitor_write_memory, monitor_insert_breakpoint,
monitor_remove_breakpoint): Update.
* remote.c (compare_sections_command): Update.
* remote-m32r-sdi.c (m32r_xfer_memory, m32r_insert_breakpoint,
m32r_remove_breakpoint, m32r_insert_watchpoint,
m32r_remove_watchpoint): Update.
* sol-thread.c (info_cb): Update.
* symfile.c (load_progress): Update.
Update callers of paddress or paddr_nz to use hex_string instead
(changes output of internal/error/debug messages only):
* dwarf2read.c (dump_die_shallow): Update.
* frame.c (fprint_field, fprint_frame, frame_pc_unwind,
get_frame_func, create_new_frame): Update.
* hppa-tdep.c (find_unwind_entry, unwind_command): Update.
* ia64-tdep.c (get_kernel_table, ia64_find_proc_info_x,
ia64_get_dyn_info_list): Update.
* maint.c (maintenance_translate_address): Update.
* mi/mi-cmd-var.c (mi_cmd_var_create): Update.
* target.c (target_flash_erase): Update.
Update callers of paddr/paddr_nz to use phex/phex_nz instead,
using an appropriate address size. Remove use of strlen_paddr.
* exec.c (exec_files_info): Update.
* i386-nat.c (i386_show_dr): Update.
* remote.c (remote_flash_erase): Update.
* m32r-rom.c (m32r_load_section): Update.
* monitor.c (monitor_vsprintf, monitor_store_register): Update.
* remote.c (remote_check_symbols, remote_search_memory): Update.
* remote-mips.c (mips_request, mips_common_breakpoint): Update.
* scm-valprint.c (scm_ipruk, scm_scmval_print): Update.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Update.
* sh-tdep.c (sh_generic_show_regs, sh3_show_regs, sh2e_show_regs,
sh2a_show_regs, sh2a_nofpu_show_regs, sh3e_show_regs,
sh3_dsp_show_regs, sh4_show_regs, sh4_nofpu_show_regs,
sh_dsp_show_regs): Update.
* xcoffsolib.c (sharedlibrary_command): Update.
* maint.c (maint_print_section_info): Add ADDR_SIZE parameter.
Use hex_string_custom instead of paddr.
(print_bfd_section_info): Pass address size.
(print_objfile_section_info): Likewise.
* annotate.h (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* annotate.c (annotate_source): Add GDBARCH parameter.
(annotate_frame_begin): Likewise.
* source.c (identify_source_line): Update call to annotate_source.
* stack.c (print_frame_info, print_frame): Update call to
annotate_frame_begin.
* breakpoint.c (describe_other_breakpoints): Add GDBARCH parameter.
(create_breakpoint, create_ada_exception_breakpoint): Update call.
* stack.c (print_block_frame_labels): Add GDBARCH parameter.
(print_frame_label_vars): Update call.
* symmisc.c (print_partial_symbols): Add GDBARCH parameter.
(dump_psymtab): Update call to print_partial_symbols.
(struct print_symbol_args): Add GDBARCH member.
(dump_symtab_1): Set print_symbol_args architecture member.
(print_symbol): Use it.
* windows-tdep.h (windows_xfer_shared_library): Add GDBARCH
parameter.
* windows-tdep.c (windows_xfer_shared_library): Likewise.
* i386-cygwin-tdep.c (struct cpms_data): Add GDBARCH member.
(core_process_module_section): Pass architecture from cpms_data to
windows_xfer_shared_library.
(windows_core_xfer_shared_libraries): Initialize cmps_data
architecture member.
* windows-nat.c (windows_xfer_shared_libraries): Pass architecture
to windows_xfer_shared_library.
* defs.h (print_address): Add GDBARCH parameter.
* printcmd.c (print_address): Add GDBARCH parameter.
(print_scalar_formatted, do_examine): Update call.
* findcmd.c (find_command): Update call.
* tracepoint.c: Include "arch-utils.h".
(trace_find_line_command): Update call.
* tui/tui-disasm.c (tui_disassemble): Update call.
* value.h (print_address_demangle): Add GDBARCH parameter.
* printcmd.c (print_address_demangle): Add GDBARCH parameter.
* c-valprint.c (print_function_pointer_address, c_val_print):
Update call.
* f-valprint.c (f_val_print): Update call.
* gnu-v3-abi.c (gnuv3_print_method_ptr): Update call.
* jv-valprint.c (java_val_print): Update call.
* m2-valprint.c (print_function_pointer_address, m2_val_print):
Update call.
* p-valprint.c (pascal_val_print): Update call.
* disasm.c (gdb_disassemble_info): Install architecture into
di.application_data field.
testsuite/ChangeLog:
* gdb.threads/tls-shared.exp: Update to locexpr_describe_location
change to prefix TLS offset in hex with 0x.
doc/ChangeLog:
* gdbint.texinfo (Item Output Functions): Update signature
for ui_out_field_core_addr.
2009-07-02 19:21:10 +02:00
|
|
|
struct gdbarch *gdbarch, CORE_ADDR address);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_field_string (struct ui_out * uiout, const char *fldname,
|
2000-02-03 05:14:45 +01:00
|
|
|
const char *string);
|
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_field_stream (struct ui_out *uiout, const char *fldname,
|
2000-05-28 03:12:42 +02:00
|
|
|
struct ui_stream *buf);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_field_fmt (struct ui_out *uiout, const char *fldname,
|
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
|
|
|
const char *format, ...)
|
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
|
|
|
ATTRIBUTE_PRINTF (3, 4);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_field_skip (struct ui_out *uiout, const char *fldname);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_spaces (struct ui_out *uiout, int numspaces);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2001-06-11 18:34:47 +02:00
|
|
|
extern void ui_out_text (struct ui_out *uiout, const char *string);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_message (struct ui_out *uiout, int verbosity,
|
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
|
|
|
const char *format, ...)
|
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
|
|
|
ATTRIBUTE_PRINTF (3, 4);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern struct ui_stream *ui_out_stream_new (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_stream_delete (struct ui_stream *buf);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
struct cleanup *make_cleanup_ui_out_stream_delete (struct ui_stream *buf);
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_wrap_hint (struct ui_out *uiout, char *identstring);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_flush (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_get_field_separator (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern int ui_out_set_flags (struct ui_out *uiout, int mask);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern int ui_out_clear_flags (struct ui_out *uiout, int mask);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern int ui_out_get_verblvl (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
extern int ui_out_test_flags (struct ui_out *uiout, int mask);
|
|
|
|
|
|
|
|
#if 0
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_result_begin (struct ui_out *uiout, char *class);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_result_end (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_info_begin (struct ui_out *uiout, char *class);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_info_end (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_notify_begin (struct ui_out *uiout, char *class);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_notify_end (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_error_begin (struct ui_out *uiout, char *class);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void ui_out_error_end (struct ui_out *uiout);
|
2000-02-03 05:14:45 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 0
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void gdb_error (struct ui_out *uiout, int severity, char *format, ...);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void gdb_query (struct ui_out *uiout, int qflags, char *qprompt);
|
2000-02-03 05:14:45 +01:00
|
|
|
#endif
|
|
|
|
|
2001-07-06 05:53:11 +02:00
|
|
|
/* HACK: Code in GDB is currently checking to see the type of ui_out
|
|
|
|
builder when determining which output to produce. This function is
|
|
|
|
a hack to encapsulate that test. Once GDB manages to separate the
|
|
|
|
CLI/MI from the core of GDB the problem should just go away .... */
|
|
|
|
|
|
|
|
extern int ui_out_is_mi_like_p (struct ui_out *uiout);
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
/* From here on we have things that are only needed by implementation
|
|
|
|
routines and main.c. We should pehaps have a separate file for that,
|
2011-01-12 02:23:29 +01:00
|
|
|
like a ui-out-impl.h file. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
/* User Interface Output Implementation Function Table */
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
/* Type definition of all implementation functions. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
typedef void (table_begin_ftype) (struct ui_out * uiout,
|
2001-06-19 18:19:16 +02:00
|
|
|
int nbrofcols, int nr_rows,
|
|
|
|
const char *tblid);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (table_body_ftype) (struct ui_out * uiout);
|
|
|
|
typedef void (table_end_ftype) (struct ui_out * uiout);
|
|
|
|
typedef void (table_header_ftype) (struct ui_out * uiout, int width,
|
2001-06-21 17:39:54 +02:00
|
|
|
enum ui_align align, const char *col_name,
|
2001-06-10 02:22:41 +02:00
|
|
|
const char *colhdr);
|
2001-05-09 02:23:23 +02:00
|
|
|
/* Note: level 0 is the top-level so LEVEL is always greater than
|
2011-01-12 02:23:29 +01:00
|
|
|
zero. */
|
2001-05-09 03:33:10 +02:00
|
|
|
typedef void (ui_out_begin_ftype) (struct ui_out *uiout,
|
|
|
|
enum ui_out_type type,
|
|
|
|
int level, const char *id);
|
|
|
|
typedef void (ui_out_end_ftype) (struct ui_out *uiout,
|
|
|
|
enum ui_out_type type,
|
|
|
|
int level);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (field_int_ftype) (struct ui_out * uiout, int fldno, int width,
|
2001-06-10 02:22:41 +02:00
|
|
|
enum ui_align align,
|
|
|
|
const char *fldname, int value);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (field_skip_ftype) (struct ui_out * uiout, int fldno, int width,
|
2001-06-10 02:22:41 +02:00
|
|
|
enum ui_align align,
|
|
|
|
const char *fldname);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (field_string_ftype) (struct ui_out * uiout, int fldno, int width,
|
2001-06-10 02:22:41 +02:00
|
|
|
enum ui_align align,
|
|
|
|
const char *fldname,
|
2000-02-03 05:14:45 +01:00
|
|
|
const char *string);
|
|
|
|
typedef void (field_fmt_ftype) (struct ui_out * uiout, int fldno, int width,
|
2001-06-10 02:22:41 +02:00
|
|
|
enum ui_align align,
|
|
|
|
const char *fldname,
|
|
|
|
const char *format,
|
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
|
|
|
va_list args) ATTRIBUTE_FPTR_PRINTF(6,0);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (spaces_ftype) (struct ui_out * uiout, int numspaces);
|
2001-06-10 02:22:41 +02:00
|
|
|
typedef void (text_ftype) (struct ui_out * uiout,
|
|
|
|
const char *string);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (message_ftype) (struct ui_out * uiout, int verbosity,
|
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
|
|
|
const char *format, va_list args)
|
|
|
|
ATTRIBUTE_FPTR_PRINTF(3,0);
|
2000-02-03 05:14:45 +01:00
|
|
|
typedef void (wrap_hint_ftype) (struct ui_out * uiout, char *identstring);
|
|
|
|
typedef void (flush_ftype) (struct ui_out * uiout);
|
2003-06-28 18:19:07 +02:00
|
|
|
typedef int (redirect_ftype) (struct ui_out * uiout,
|
|
|
|
struct ui_file * outstream);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
/* ui-out-impl */
|
|
|
|
|
|
|
|
/* IMPORTANT: If you change this structure, make sure to change the default
|
2011-01-12 02:23:29 +01:00
|
|
|
initialization in ui-out.c. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
struct ui_out_impl
|
|
|
|
{
|
|
|
|
table_begin_ftype *table_begin;
|
|
|
|
table_body_ftype *table_body;
|
|
|
|
table_end_ftype *table_end;
|
|
|
|
table_header_ftype *table_header;
|
2001-05-09 03:33:10 +02:00
|
|
|
ui_out_begin_ftype *begin;
|
|
|
|
ui_out_end_ftype *end;
|
2000-02-03 05:14:45 +01:00
|
|
|
field_int_ftype *field_int;
|
|
|
|
field_skip_ftype *field_skip;
|
|
|
|
field_string_ftype *field_string;
|
|
|
|
field_fmt_ftype *field_fmt;
|
|
|
|
spaces_ftype *spaces;
|
|
|
|
text_ftype *text;
|
|
|
|
message_ftype *message;
|
|
|
|
wrap_hint_ftype *wrap_hint;
|
|
|
|
flush_ftype *flush;
|
2003-06-28 18:19:07 +02:00
|
|
|
redirect_ftype *redirect;
|
2001-07-06 05:53:11 +02:00
|
|
|
int is_mi_like_p;
|
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
|
|
|
extern void *ui_out_data (struct ui_out *uiout);
|
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
|
|
|
extern void uo_field_string (struct ui_out *uiout, int fldno, int width,
|
|
|
|
enum ui_align align, const char *fldname,
|
|
|
|
const char *string);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
/* Create a ui_out object */
|
|
|
|
|
|
|
|
extern struct ui_out *ui_out_new (struct ui_out_impl *impl,
|
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
|
|
|
void *data,
|
2000-02-03 05:14:45 +01:00
|
|
|
int flags);
|
|
|
|
|
2003-06-28 18:19:07 +02:00
|
|
|
/* Redirect the ouptut of a ui_out object temporarily. */
|
|
|
|
|
|
|
|
extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream);
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
#endif /* UI_OUT_H */
|