Constify wrap_here/wrap_hint code path

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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d6d5dc6554667952d18cbb980ed5dd6e9e3f6d59..25f40333e254b7091fe20ce6bc73be7d69a19372 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
        * ui-out.c (uo_redirect): Return the return value from the

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 0c982cb2e6d7ccf64f50342b1b9ce4e7eb7f1a46..d2082076817ef1ed0cbf9715cb1a33879040dc63 100644 (file)
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -290,7 +290,7 @@ cli_message (struct ui_out *uiout, int verbosity,
 }
 
 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);
 

diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index 0f484260945264217658b18abccb9be2895d4d8a..960529c712ae677d983a325385b5c80ee36704b9 100644 (file)
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -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,
                        const char *format, va_list args)
      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 int mi_redirect (struct ui_out *uiout, struct ui_file *outstream);
 
@@ -273,7 +273,7 @@ mi_message (struct ui_out *uiout, int verbosity,
 }
 
 void
-mi_wrap_hint (struct ui_out *uiout, char *identstring)
+mi_wrap_hint (struct ui_out *uiout, const char *identstring)
 {
   wrap_here (identstring);
 }

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 7f365457d25065a0b5f4fa49d0693a16e2b39fc1..64d0443369c26a71a90a792e7baab23dcf709073 100644 (file)
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -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,
                        const char *format, va_list args)
      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 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
-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);
 }
@@ -683,7 +683,7 @@ uo_message (struct ui_out *uiout, int verbosity,
 }
 
 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)
     return;

diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index 864048cc0b8d6b1dc401ad3ae63023d8676d36b9..569f762e497054a3c04ee3eb4f23b89f30f037c1 100644 (file)
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -123,7 +123,7 @@ extern void ui_out_message (struct ui_out *uiout, int verbosity,
                            const char *format, ...)
      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);
 
@@ -186,7 +186,7 @@ typedef void (text_ftype) (struct ui_out * uiout,
 typedef void (message_ftype) (struct ui_out * uiout, int verbosity,
                              const char *format, va_list args)
      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 int (redirect_ftype) (struct ui_out * uiout,
                              struct ui_file * outstream);

diff --git a/gdb/utils.c b/gdb/utils.c
index 8ca0a2ee779f90f024fe726baffe604ae5e0f730..3a88e2a97162bc3c14fe88ee6617d6cbc4253b46 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1628,7 +1628,7 @@ static char *wrap_pointer;
 
 /* String to indent by if the wrap occurs.  Must not be NULL if wrap_column
    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
    is not in effect.  */
@@ -1911,7 +1911,7 @@ reinitialize_more_filter (void)
    used to force out output from the wrap_buffer.  */
 
 void
-wrap_here (char *indent)
+wrap_here (const char *indent)
 {
   /* This should have been allocated, but be paranoid anyway.  */
   if (!wrap_buffer)

diff --git a/gdb/utils.h b/gdb/utils.h
index 62091f078945c4e2b3e1f576c70c6d63cad411dc..f2fb54db027667dedb33b5e8cf4b43c00afbdef0 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -146,7 +146,7 @@ extern int yquery (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
 
 extern void begin_line (void);
 
-extern void wrap_here (char *);
+extern void wrap_here (const char *);
 
 extern void reinitialize_more_filter (void);