OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduce enum_flag type for ui_out flags 

This patch changes the ui_out flags to be an enum flag.

gdb/ChangeLog:

	* ui-out.h: Include "common/enum-flags.h".
	(enum ui_flags): Rename to ...
	(enum ui_out_flag): ... this.
	(ui_out_flags): Define enum flag type.
	(ui_out_test_flags): Change type of parameter to ui_out_flags.
	(ui_out_new): Likewise.
	* ui-out.c (ui_out_test_flags): Likewise.
	(ui_out_new): Likewise.
	* cli-out.c (cli_out_new): Update variable type.
	* mi/mi-out.c (mi_out_new): Likewise.
	* tui/tui-out.c (tui_out_new): Likewise.
This commit is contained in:
Simon Marchi 2016-12-02 17:12:37 -05:00 committed by Simon Marchi
parent 107c2d628b
commit bef721e278
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/ChangeLog
View File

@ -1,3 +1,17 @@
2016-12-02 Simon Marchi <simon.marchi@polymtl.ca>
* ui-out.h: Include "common/enum-flags.h".
(enum ui_flags): Rename to ...
(enum ui_out_flag): ... this.
(ui_out_flags): Define enum flag type.
(ui_out_test_flags): Change type of parameter to ui_out_flags.
(ui_out_new): Likewise.
* ui-out.c (ui_out_test_flags): Likewise.
(ui_out_new): Likewise.
* cli-out.c (cli_out_new): Update variable type.
* mi/mi-out.c (mi_out_new): Likewise.
* tui/tui-out.c (tui_out_new): Likewise.
2016-12-02 Pedro Alves <palves@redhat.com> 2016-12-02 Pedro Alves <palves@redhat.com>
* NEWS: Mention that user commands now accept an unlimited number * NEWS: Mention that user commands now accept an unlimited number

2
gdb/cli-out.c
View File

@ -388,7 +388,7 @@ cli_out_data_ctor (cli_out_data *self, struct ui_file *stream)
struct ui_out * struct ui_out *
cli_out_new (struct ui_file *stream) cli_out_new (struct ui_file *stream)
{ {
int flags = ui_source_list; ui_out_flags flags = ui_source_list;
cli_out_data *data = new cli_out_data (); cli_out_data *data = new cli_out_data ();
cli_out_data_ctor (data, stream); cli_out_data_ctor (data, stream);

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

@ -393,7 +393,7 @@ mi_out_data_dtor (struct ui_out *ui_out)
struct ui_out * struct ui_out *
mi_out_new (int mi_version) mi_out_new (int mi_version)
{ {
int flags = 0; ui_out_flags flags = 0;
mi_out_data *data = new mi_out_data (); mi_out_data *data = new mi_out_data ();
struct ui_file *stream = mem_fileopen (); struct ui_file *stream = mem_fileopen ();

2
gdb/tui/tui-out.c
View File

@ -145,7 +145,7 @@ tui_text (struct ui_out *uiout, const char *string)
struct ui_out * struct ui_out *
tui_out_new (struct ui_file *stream) tui_out_new (struct ui_file *stream)
{ {
int flags = 0; ui_out_flags flags = 0;
tui_out_data *data = new tui_out_data (); tui_out_data *data = new tui_out_data ();

4
gdb/ui-out.c
View File

@ -702,7 +702,7 @@ ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream)
/* Test the flags against the mask given. */ /* Test the flags against the mask given. */
int int
ui_out_test_flags (struct ui_out *uiout, int mask) ui_out_test_flags (struct ui_out *uiout, ui_out_flags mask)
{ {
return (uiout->flags & mask); return (uiout->flags & mask);
} }
@ -923,7 +923,7 @@ ui_out_query_field (struct ui_out *uiout, int colno,
struct ui_out * struct ui_out *
ui_out_new (const struct ui_out_impl *impl, void *data, ui_out_new (const struct ui_out_impl *impl, void *data,
int flags) ui_out_flags flags)
{ {
struct ui_out *uiout = new ui_out (); struct ui_out *uiout = new ui_out ();

15
gdb/ui-out.h
View File

@ -23,6 +23,8 @@
#ifndef UI_OUT_H #ifndef UI_OUT_H
#define UI_OUT_H 1 #define UI_OUT_H 1
#include "common/enum-flags.h"
/* The ui_out structure */ /* The ui_out structure */
struct ui_out; struct ui_out;
@ -45,12 +47,12 @@ enum ui_align
}; };
/* flags enum */ /* flags enum */
enum ui_flags enum ui_out_flag
{ {
ui_from_tty = 1, ui_source_list = (1 << 0),
ui_source_list = 2
}; };
DEF_ENUM_FLAGS_TYPE (ui_out_flag, ui_out_flags);
/* Prototypes for ui-out API. */ /* Prototypes for ui-out API. */
@ -127,7 +129,7 @@ extern void ui_out_wrap_hint (struct ui_out *uiout, const char *identstring);
extern void ui_out_flush (struct ui_out *uiout); extern void ui_out_flush (struct ui_out *uiout);
extern int ui_out_test_flags (struct ui_out *uiout, int mask); extern int ui_out_test_flags (struct ui_out *uiout, ui_out_flags mask);
extern int ui_out_query_field (struct ui_out *uiout, int colno, extern int ui_out_query_field (struct ui_out *uiout, int colno,
int *width, int *alignment, int *width, int *alignment,
@ -222,9 +224,8 @@ extern void uo_field_string (struct ui_out *uiout, int fldno, int width,
/* Create a ui_out object */ /* Create a ui_out object */
extern struct ui_out *ui_out_new (const struct ui_out_impl *impl, extern struct ui_out *ui_out_new (const struct ui_out_impl *impl, void *data,
void *data, ui_out_flags flags);
int flags);
/* Redirect the ouptut of a ui_out object temporarily. */ /* Redirect the ouptut of a ui_out object temporarily. */