espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-01 01:45:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: make saved_filename an std::string

Browse Source 
Make this variable an std::string, avoiding manual memory management.

Change-Id: Ie7a8d7381449ab9c4dfc4cb8b99e63b9ffa8f947
This commit is contained in:
Simon Marchi
2021-12-02 14:53:06 -05:00
parent 69ce6091e6
commit ce1a6f421d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gdb/cli/cli-logging.c
View File

@ -24,7 +24,7 @@
#include "cli/cli-style.h" #include "cli/cli-style.h"
#include "cli/cli-decode.h" #include "cli/cli-decode.h"
static char *saved_filename; static std::string saved_filename;
static std::string logging_filename = "gdb.txt"; static std::string logging_filename = "gdb.txt";
static void static void
@ -40,9 +40,9 @@ static bool logging_overwrite;
static void static void
maybe_warn_already_logging () maybe_warn_already_logging ()
{ {
if (saved_filename) if (!saved_filename.empty ())
warning (_("Currently logging to %s. Turn the logging off and on to " warning (_("Currently logging to %s. Turn the logging off and on to "
"make the new setting effective."), saved_filename); "make the new setting effective."), saved_filename.c_str ());
} }
static void static void
@ -95,10 +95,10 @@ pop_output_files (void)
static void static void
handle_redirections (int from_tty) handle_redirections (int from_tty)
{ {
if (saved_filename != NULL) if (!saved_filename.empty ())
{ {
fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n", fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n",
saved_filename); saved_filename.c_str ());
return; return;
} }
@ -124,7 +124,7 @@ handle_redirections (int from_tty)
logging_filename.c_str ()); logging_filename.c_str ());
} }
saved_filename = xstrdup (logging_filename.c_str ()); saved_filename = logging_filename;
/* Let the interpreter do anything it needs. */ /* Let the interpreter do anything it needs. */
current_interp_set_logging (std::move (log), logging_redirect, current_interp_set_logging (std::move (log), logging_redirect,
@ -154,14 +154,14 @@ set_logging_on (const char *args, int from_tty)
static void static void
set_logging_off (const char *args, int from_tty) set_logging_off (const char *args, int from_tty)
{ {
if (saved_filename == NULL) if (saved_filename.empty ())
return; return;
pop_output_files (); pop_output_files ();
if (from_tty) if (from_tty)
fprintf_unfiltered (gdb_stdout, "Done logging to %s.\n", saved_filename); fprintf_unfiltered (gdb_stdout, "Done logging to %s.\n",
xfree (saved_filename); saved_filename.c_str ());
saved_filename = NULL; saved_filename.clear ();
} }
static bool logging_enabled; static bool logging_enabled;