Use std::string in do_set_command

do_set_command manually updates a string, only to copy it to a
std::string and free the working copy.  This patch changes this code
to use std::string for everything, simplifying the code and removing a
copy.

Reviewed-by: John Baldwin <jhb@FreeBSD.org>

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index ecb739b94e90da01993590ed881609dbc989788c..c7bbac1666d3c0a96d9c62a9e9247c4b5154568b 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -340,14 +340,12 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
     {
     case var_string:
       {
-       char *newobj;
+       std::string newobj;
        const char *p;
-       char *q;
        int ch;
 
-       newobj = (char *) xmalloc (strlen (arg) + 2);
+       newobj.reserve (strlen (arg));
        p = arg;
-       q = newobj;
        while ((ch = *p++) != '\000')
          {
            if (ch == '\\')
@@ -365,20 +363,14 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
                if (ch == 0)
                  break;        /* C loses */
                else if (ch > 0)
-                 *q++ = ch;
+                 newobj.push_back (ch);
              }
            else
-             *q++ = ch;
+             newobj.push_back (ch);
          }
-#if 0
-       if (*(p - 1) != '\\')
-         *q++ = ' ';
-#endif
-       *q++ = '\0';
-       newobj = (char *) xrealloc (newobj, q - newobj);
-
-       option_changed = c->var->set<std::string> (std::string (newobj));
-       xfree (newobj);
+       newobj.shrink_to_fit ();
+
+       option_changed = c->var->set<std::string> (std::move (newobj));
       }
       break;
     case var_string_noescape: