This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 05/18] -Wwrite-strings: Constify warning_pre_print
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 4 Apr 2017 18:25:38 +0100
- Subject: [PATCH 05/18] -Wwrite-strings: Constify warning_pre_print
- Authentication-results: sourceware.org; auth=none
- Authentication-results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
- Authentication-results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves at redhat dot com
- Dkim-filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7CD2B3DBC1
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7CD2B3DBC1
- References: <1491326751-16180-1-git-send-email-palves@redhat.com>
-Wwrite-strings flags a warning here:
char *warning_pre_print = "\nwarning: ";
* 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.
---
gdb/main.c | 6 ++++--
gdb/utils.c | 2 +-
gdb/utils.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gdb/main.c b/gdb/main.c
index 30e27c2..df4b111 100644
--- 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 39798cc..6b8f2f7 100644
--- 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 fb75f2e..2380bd7 100644
--- 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;
--
2.5.5