espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 15:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use std::vector for mi_ui_out_data::streams

Browse Source 
Use a standard vector instead of the home-made version.  I used a vector
of plain pointers, because the mi_ui_out_data object doesn't own the
streams objects (i.e. they shouldn't be deleted when the vector is
deleted).

gdb/ChangeLog:

	* mi/mi-out.c: Remove vec.h include.
	(mi_ui_out_data) <streams>: Change type to std::vector.
	(mi_field_string): Update.
	(mi_field_fmt): Update.
	(mi_flush): Update.
	(mi_redirect): Update.
	(field_separator): Update.
	(mi_open): Update.
	(mi_close): Update.
	(mi_out_buffered): Update.
	(mi_out_rewind): Update.
	(mi_out_put): Update.
	(mi_out_data_ctor): Update.
	(mi_out_data_dtor): Don't free streams.
This commit is contained in:
Simon Marchi
2016-11-30 21:43:17 -05:00
parent 56df308484
commit 4a9d4ea535
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gdb/ChangeLog
View File

@ -1,3 +1,20 @@
2016-11-30 Simon Marchi <simon.marchi@polymtl.ca>
* mi/mi-out.c: Remove vec.h include.
(mi_ui_out_data) <streams>: Change type to std::vector.
(mi_field_string): Update.
(mi_field_fmt): Update.
(mi_flush): Update.
(mi_redirect): Update.
(field_separator): Update.
(mi_open): Update.
(mi_close): Update.
(mi_out_buffered): Update.
(mi_out_rewind): Update.
(mi_out_put): Update.
(mi_out_data_ctor): Update.
(mi_out_data_dtor): Don't free streams.
2016-11-30 Simon Marchi <simon.marchi@polymtl.ca> 2016-11-30 Simon Marchi <simon.marchi@polymtl.ca>
* ui-out.c (ui_out_level_p): Remove typedef. * ui-out.c (ui_out_level_p): Remove typedef.

31
gdb/mi/mi-out.c
View File

@ -22,17 +22,14 @@
#include "defs.h" #include "defs.h"
#include "ui-out.h" #include "ui-out.h"
#include "mi-out.h" #include "mi-out.h"
#include "vec.h" #include <vector>
typedef struct ui_file *ui_filep;
DEF_VEC_P (ui_filep);
struct mi_ui_out_data struct mi_ui_out_data
{ {
int suppress_field_separator; int suppress_field_separator;
int suppress_output; int suppress_output;
int mi_version; int mi_version;
VEC (ui_filep) *streams; std::vector<ui_file *> streams;
}; };
typedef struct mi_ui_out_data mi_out_data; typedef struct mi_ui_out_data mi_out_data;
@ -222,7 +219,7 @@ mi_field_string (struct ui_out *uiout, int fldno, int width,
if (data->suppress_output) if (data->suppress_output)
return; return;
stream = VEC_last (ui_filep, data->streams); stream = data->streams.back ();
field_separator (uiout); field_separator (uiout);
if (fldname) if (fldname)
fprintf_unfiltered (stream, "%s=", fldname); fprintf_unfiltered (stream, "%s=", fldname);
@ -245,7 +242,7 @@ mi_field_fmt (struct ui_out *uiout, int fldno, int width,
if (data->suppress_output) if (data->suppress_output)
return; return;
stream = VEC_last (ui_filep, data->streams); stream = data->streams.back ();
field_separator (uiout); field_separator (uiout);
if (fldname) if (fldname)
fprintf_unfiltered (stream, "%s=\"", fldname); fprintf_unfiltered (stream, "%s=\"", fldname);
@ -280,7 +277,7 @@ void
mi_flush (struct ui_out *uiout) mi_flush (struct ui_out *uiout)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams); struct ui_file *stream = data->streams.back ();
gdb_flush (stream); gdb_flush (stream);
} }
@ -291,9 +288,9 @@ mi_redirect (struct ui_out *uiout, struct ui_file *outstream)
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
if (outstream != NULL) if (outstream != NULL)
VEC_safe_push (ui_filep, data->streams, outstream); data->streams.push_back (outstream);
else else
VEC_pop (ui_filep, data->streams); data->streams.pop_back ();
return 0; return 0;
} }
@ -306,7 +303,7 @@ static void
field_separator (struct ui_out *uiout) field_separator (struct ui_out *uiout)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams); ui_file *stream = data->streams.back ();
if (data->suppress_field_separator) if (data->suppress_field_separator)
data->suppress_field_separator = 0; data->suppress_field_separator = 0;
@ -318,7 +315,7 @@ static void
mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams); ui_file *stream = data->streams.back ();
field_separator (uiout); field_separator (uiout);
data->suppress_field_separator = 1; data->suppress_field_separator = 1;
@ -341,7 +338,7 @@ static void
mi_close (struct ui_out *uiout, enum ui_out_type type) mi_close (struct ui_out *uiout, enum ui_out_type type)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams); ui_file *stream = data->streams.back ();
switch (type) switch (type)
{ {
@ -363,7 +360,7 @@ void
mi_out_rewind (struct ui_out *uiout) mi_out_rewind (struct ui_out *uiout)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams); ui_file *stream = data->streams.back ();
ui_file_rewind (stream); ui_file_rewind (stream);
} }
@ -374,7 +371,7 @@ void
mi_out_put (struct ui_out *uiout, struct ui_file *stream) mi_out_put (struct ui_out *uiout, struct ui_file *stream)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (uiout); mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
struct ui_file *outstream = VEC_last (ui_filep, data->streams); ui_file *outstream = data->streams.back ();
ui_file_put (outstream, ui_file_write_for_put, stream); ui_file_put (outstream, ui_file_write_for_put, stream);
ui_file_rewind (outstream); ui_file_rewind (outstream);
@ -397,8 +394,7 @@ mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream)
{ {
gdb_assert (stream != NULL); gdb_assert (stream != NULL);
self->streams = NULL; self->streams.push_back (stream);
VEC_safe_push (ui_filep, self->streams, stream);
self->suppress_field_separator = 0; self->suppress_field_separator = 0;
self->suppress_output = 0; self->suppress_output = 0;
@ -412,7 +408,6 @@ mi_out_data_dtor (struct ui_out *ui_out)
{ {
mi_out_data *data = (mi_out_data *) ui_out_data (ui_out); mi_out_data *data = (mi_out_data *) ui_out_data (ui_out);
VEC_free (ui_filep, data->streams);
delete data; delete data;
} }