Remove cleanup from backtrace_command

This removes a cleanup from backtrace_command, replacing it with
std::string.  This patch temporarily changes backtrace_command so that
the parameter is named "args_in" and is immediately constified; this
is fixed again in the constification patch.

gdb/ChangeLog
2017-11-07  Tom Tromey  <tom@tromey.com>

	* stack.c (backtrace_command): Use std::string.
	(backtrace_command_1): Make "count_exp" const.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8d956f35e51003f9e086ec2ea7e8979bd6e1dbf..ce8110fc2710d9752427ea7b2e7f26163e15afac 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-07  Tom Tromey  <tom@tromey.com>
+
+       * stack.c (backtrace_command): Use std::string.
+       (backtrace_command_1): Make "count_exp" const.
+
 2017-11-07  Tom Tromey  <tom@tromey.com>
 
        * source.c (directory_switch, mod_path, add_path): Constify.

diff --git a/gdb/stack.c b/gdb/stack.c
index 24fad3ceb27bcfba76c110a48a1c927d77918f2f..6256bbed4484347dad9da5e09c5f920fa3bda9c0 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1692,7 +1692,7 @@ info_frame_command (char *addr_exp, int from_tty)
    frames.  */
 
 static void
-backtrace_command_1 (char *count_exp, int show_locals, int no_filters,
+backtrace_command_1 (const char *count_exp, int show_locals, int no_filters,
                     int from_tty)
 {
   struct frame_info *fi;
@@ -1844,12 +1844,13 @@ backtrace_command_1 (char *count_exp, int show_locals, int no_filters,
 }
 
 static void
-backtrace_command (char *arg, int from_tty)
+backtrace_command (char *arg_in, int from_tty)
 {
-  struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
   int fulltrace_arg = -1, arglen = 0, argc = 0, no_filters  = -1;
   int user_arg = 0;
+  const char *arg = arg_in;
 
+  std::string reconstructed_arg;
   if (arg)
     {
       char **argv;
@@ -1884,17 +1885,15 @@ backtrace_command (char *arg, int from_tty)
        {
          if (arglen > 0)
            {
-             arg = (char *) xmalloc (arglen + 1);
-             make_cleanup (xfree, arg);
-             arg[0] = 0;
              for (i = 0; i < argc; i++)
                {
                  if (i != fulltrace_arg && i != no_filters)
                    {
-                     strcat (arg, argv[i]);
-                     strcat (arg, " ");
+                     reconstructed_arg += argv[i];
+                     reconstructed_arg += " ";
                    }
                }
+             arg = reconstructed_arg.c_str ();
            }
          else
            arg = NULL;
@@ -1903,8 +1902,6 @@ backtrace_command (char *arg, int from_tty)
 
   backtrace_command_1 (arg, fulltrace_arg >= 0 /* show_locals */,
                       no_filters >= 0 /* no frame-filters */, from_tty);
-
-  do_cleanups (old_chain);
 }
 
 /* Iterate over the local variables of a block B, calling CB with