-Wwrite-strings: Constify warning_pre_print

-Wwrite-strings flags a warning here:

  char *warning_pre_print = "\nwarning: ";

gdb/ChangeLog:
2017-04-05  Pedro Alves	 <palves@redhat.com>

	* main.c (captured_main_1): Use gdb::unique_xmalloc_ptr to manage
	the memory of the temporary warning_pre_print override.
	* utils.c (warning_pre_print): Constify.
	* utils.h (warning_pre_print): Constify.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 00f8d1c87bd4b6c0d22181037fc41eaa3d51f744..f07927d468cbf5a7face57250cd9fe7b566b5b67 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-05  Pedro Alves         <palves@redhat.com>
+
+       * main.c (captured_main_1): Use gdb::unique_xmalloc_ptr to manage
+       the memory of the temporary warning_pre_print override.
+       * utils.c (warning_pre_print): Constify.
+       * utils.h (warning_pre_print): Constify.
+
 2017-04-05  Pedro Alves         <palves@redhat.com>
 
        * cli/cli-cmds.c (shell_escape): Constify 'arg' parameter.

diff --git a/gdb/main.c b/gdb/main.c
index 30e27c2a771320ad9df2ba9ee12704d25f26c9c6..df4b1110d6b59cb9316c2c51bd93141102a4d632 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -545,7 +545,9 @@ captured_main_1 (struct captured_main_args *context)
 #endif
 
   /* Prefix warning messages with the command name.  */
-  warning_pre_print = xstrprintf ("%s: warning: ", gdb_program_name);
+  gdb::unique_xmalloc_ptr<char> tmp_warn_preprint
+    (xstrprintf ("%s: warning: ", gdb_program_name));
+  warning_pre_print = tmp_warn_preprint.get ();
 
   if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
     perror_warning_with_name (_("error finding working directory"));
@@ -972,7 +974,7 @@ captured_main_1 (struct captured_main_args *context)
     }
 
   /* Set off error and warning messages with a blank line.  */
-  xfree (warning_pre_print);
+  tmp_warn_preprint.reset ();
   warning_pre_print = _("\nwarning: ");
 
   /* Read and execute the system-wide gdbinit file, if it exists.

diff --git a/gdb/utils.c b/gdb/utils.c
index 39798cc47ede0c26d949c26e08b0f41373e49a69..6b8f2f7820aef481f1657e49dc82da4c62422eb0 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -122,7 +122,7 @@ show_sevenbit_strings (struct ui_file *file, int from_tty,
 
 /* String to be printed before warning messages, if any.  */
 
-char *warning_pre_print = "\nwarning: ";
+const char *warning_pre_print = "\nwarning: ";
 
 int pagination_enabled = 1;
 static void

diff --git a/gdb/utils.h b/gdb/utils.h
index fb75f2e97c7e47a9f9c711a1ccb0ca7107727edb..2380bd7121dcd89c3870fc0665a7a4b7163ae285 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -298,7 +298,7 @@ extern void (*deprecated_error_begin_hook) (void);
 
 /* Message to be printed before the warning message, when a warning occurs.  */
 
-extern char *warning_pre_print;
+extern const char *warning_pre_print;
 
 extern void error_stream (const string_file &) ATTRIBUTE_NORETURN;