FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Constify wrap_here/wrap_hint code path

Browse source 
Constify the data path between ui_out_wrap_hint and the wrap_indent
global, because we can.  It's clearer that the argument passed to
wrap_hint is not intended to be modified by the ui_out implementation.

gdb/ChangeLog:

	* mi/mi-out.c (mi_wrap_hint): Constify argument.
	* cli-out.c (cli_wrap_hint): Likewise.
	* ui-out.c (ui_out_wrap_hint, uo_wrap_hint): Likewise.
	* ui-out.h (ui_out_wrap_hint, wrap_hint_ftype): Likewise.
	* utils.c (wrap_here): Likewise.
	(wrap_indent): Constify.
	* utils.h (wrap_here): Constify argument.
This commit is contained in:
Simon Marchi 2016-11-26 22:05:42 -05:00
parent 82bbe65a43
commit d2c0eef48a
7 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gdb/ChangeLog
View file

@ -1,3 +1,13 @@
2016-11-26 Simon Marchi <simon.marchi@polymtl.ca>
* mi/mi-out.c (mi_wrap_hint): Constify argument.
* cli-out.c (cli_wrap_hint): Likewise.
* ui-out.c (ui_out_wrap_hint, uo_wrap_hint): Likewise.
* ui-out.h (ui_out_wrap_hint, wrap_hint_ftype): Likewise.
* utils.c (wrap_here): Likewise.
(wrap_indent): Constify.
* utils.h (wrap_here): Constify argument.
2016-11-26 Simon Marchi <simon.marchi@polymtl.ca> 2016-11-26 Simon Marchi <simon.marchi@polymtl.ca>
* ui-out.c (uo_redirect): Return the return value from the * ui-out.c (uo_redirect): Return the return value from the

2
gdb/cli-out.c
View file

@ -290,7 +290,7 @@ cli_message (struct ui_out *uiout, int verbosity,
} }
static void static void
cli_wrap_hint (struct ui_out *uiout, char *identstring) cli_wrap_hint (struct ui_out *uiout, const char *identstring)
{ {
cli_out_data *data = (cli_out_data *) ui_out_data (uiout); cli_out_data *data = (cli_out_data *) ui_out_data (uiout);

4
gdb/mi/mi-out.c
View file

@ -65,7 +65,7 @@ static void mi_text (struct ui_out *uiout, const char *string);
static void mi_message (struct ui_out *uiout, int verbosity, static void mi_message (struct ui_out *uiout, int verbosity,
const char *format, va_list args) const char *format, va_list args)
ATTRIBUTE_PRINTF (3, 0); ATTRIBUTE_PRINTF (3, 0);
static void mi_wrap_hint (struct ui_out *uiout, char *identstring); static void mi_wrap_hint (struct ui_out *uiout, const char *identstring);
static void mi_flush (struct ui_out *uiout); static void mi_flush (struct ui_out *uiout);
static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream); static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream);
@ -273,7 +273,7 @@ mi_message (struct ui_out *uiout, int verbosity,
} }
void void
mi_wrap_hint (struct ui_out *uiout, char *identstring) mi_wrap_hint (struct ui_out *uiout, const char *identstring)
{ {
wrap_here (identstring); wrap_here (identstring);
} }

6
gdb/ui-out.c
View file

@ -172,7 +172,7 @@ static void uo_text (struct ui_out *uiout, const char *string);
static void uo_message (struct ui_out *uiout, int verbosity, static void uo_message (struct ui_out *uiout, int verbosity,
const char *format, va_list args) const char *format, va_list args)
ATTRIBUTE_PRINTF (3, 0); ATTRIBUTE_PRINTF (3, 0);
static void uo_wrap_hint (struct ui_out *uiout, char *identstring); static void uo_wrap_hint (struct ui_out *uiout, const char *identstring);
static void uo_flush (struct ui_out *uiout); static void uo_flush (struct ui_out *uiout);
static int uo_redirect (struct ui_out *uiout, struct ui_file *outstream); static int uo_redirect (struct ui_out *uiout, struct ui_file *outstream);
@ -505,7 +505,7 @@ ui_out_message (struct ui_out *uiout, int verbosity,
} }
void void
ui_out_wrap_hint (struct ui_out *uiout, char *identstring) ui_out_wrap_hint (struct ui_out *uiout, const char *identstring)
{ {
uo_wrap_hint (uiout, identstring); uo_wrap_hint (uiout, identstring);
} }
@ -683,7 +683,7 @@ uo_message (struct ui_out *uiout, int verbosity,
} }
void void
uo_wrap_hint (struct ui_out *uiout, char *identstring) uo_wrap_hint (struct ui_out *uiout, const char *identstring)
{ {
if (!uiout->impl->wrap_hint) if (!uiout->impl->wrap_hint)
return; return;

4
gdb/ui-out.h
View file

@ -123,7 +123,7 @@ extern void ui_out_message (struct ui_out *uiout, int verbosity,
const char *format, ...) const char *format, ...)
ATTRIBUTE_PRINTF (3, 4); ATTRIBUTE_PRINTF (3, 4);
extern void ui_out_wrap_hint (struct ui_out *uiout, char *identstring); 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);
@ -186,7 +186,7 @@ typedef void (text_ftype) (struct ui_out * uiout,
typedef void (message_ftype) (struct ui_out * uiout, int verbosity, typedef void (message_ftype) (struct ui_out * uiout, int verbosity,
const char *format, va_list args) const char *format, va_list args)
ATTRIBUTE_FPTR_PRINTF(3,0); ATTRIBUTE_FPTR_PRINTF(3,0);
typedef void (wrap_hint_ftype) (struct ui_out * uiout, char *identstring); typedef void (wrap_hint_ftype) (struct ui_out * uiout, const char *identstring);
typedef void (flush_ftype) (struct ui_out * uiout); typedef void (flush_ftype) (struct ui_out * uiout);
typedef int (redirect_ftype) (struct ui_out * uiout, typedef int (redirect_ftype) (struct ui_out * uiout,
struct ui_file * outstream); struct ui_file * outstream);

4
gdb/utils.c
View file

@ -1628,7 +1628,7 @@ static char *wrap_pointer;
/* String to indent by if the wrap occurs. Must not be NULL if wrap_column /* String to indent by if the wrap occurs. Must not be NULL if wrap_column
is non-zero. */ is non-zero. */
static char *wrap_indent; static const char *wrap_indent;
/* Column number on the screen where wrap_buffer begins, or 0 if wrapping /* Column number on the screen where wrap_buffer begins, or 0 if wrapping
is not in effect. */ is not in effect. */
@ -1911,7 +1911,7 @@ reinitialize_more_filter (void)
used to force out output from the wrap_buffer. */ used to force out output from the wrap_buffer. */
void void
wrap_here (char *indent) wrap_here (const char *indent)
{ {
/* This should have been allocated, but be paranoid anyway. */ /* This should have been allocated, but be paranoid anyway. */
if (!wrap_buffer) if (!wrap_buffer)

2
gdb/utils.h
View file

@ -146,7 +146,7 @@ extern int yquery (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
extern void begin_line (void); extern void begin_line (void);
extern void wrap_here (char *); extern void wrap_here (const char *);
extern void reinitialize_more_filter (void); extern void reinitialize_more_filter (void);