introduce ui_file_write_for_put

This introduces a small helper function, ui_file_write_for_put.  It is
a wrapper for ui_write that is suitable for passing directly to
ui_file_put.

This patch also updates one existing spot to use this new function.

gdb/ChangeLog
2014-12-12  Tom Tromey  <tromey@redhat.com>

	* ui-file.h (ui_file_write_for_put): Declare.
	* ui-file.c (ui_file_write_for_put): New function.
	* mi/mi-out.c (do_write): Remove.
	(mi_out_put): Use ui_file_write_for_put.
This commit is contained in:
Tom Tromey 2014-12-12 22:12:12 +01:00 committed by Jan Kratochvil
parent 6dddd6a574
commit de571fc5fb
4 changed files with 20 additions and 7 deletions

View File

@ -1,3 +1,10 @@
2014-12-12 Tom Tromey <tromey@redhat.com>
* ui-file.h (ui_file_write_for_put): Declare.
* ui-file.c (ui_file_write_for_put): New function.
* mi/mi-out.c (do_write): Remove.
(mi_out_put): Use ui_file_write_for_put.
2014-12-12 Doug Evans <dje@google.com>
* NEWS: Mention gdb.lookup_objfile.

View File

@ -376,18 +376,12 @@ mi_out_rewind (struct ui_out *uiout)
/* Dump the buffer onto the specified stream. */
static void
do_write (void *data, const char *buffer, long length_buffer)
{
ui_file_write (data, buffer, length_buffer);
}
void
mi_out_put (struct ui_out *uiout, struct ui_file *stream)
{
mi_out_data *data = ui_out_data (uiout);
ui_file_put (data->buffer, do_write, stream);
ui_file_put (data->buffer, ui_file_write_for_put, stream);
ui_file_rewind (data->buffer);
}

View File

@ -222,6 +222,12 @@ ui_file_write (struct ui_file *file,
file->to_write (file, buf, length_buf);
}
void
ui_file_write_for_put (void *data, const char *buffer, long length_buffer)
{
ui_file_write (data, buffer, length_buffer);
}
void
ui_file_write_async_safe (struct ui_file *file,
const char *buf,

View File

@ -98,6 +98,12 @@ extern int ui_file_isatty (struct ui_file *);
extern void ui_file_write (struct ui_file *file, const char *buf,
long length_buf);
/* A wrapper for ui_file_write that is suitable for use by
ui_file_put. */
extern void ui_file_write_for_put (void *data, const char *buffer,
long length_buffer);
extern void ui_file_write_async_safe (struct ui_file *file, const char *buf,
long length_buf);