From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Thu, 19 Nov 2020 10:09:42 +0000 (+0000)
Subject: gdb: make use of skip_to_space and skip_spaces
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3ff61f8155f296633f96206c926b545b97053b3;p=binutils-gdb.git

gdb: make use of skip_to_space and skip_spaces

Some late feedback on this commit:

  commit 037d7135de575c9e0c20e9158c105979bfee339c
  Date:   Mon Nov 16 11:36:56 2020 +0000

      gdb: improve command completion for 'print', 'x', and 'display'

Suggested making use of the skip_to_space and skip_spaces helper
functions.  There should be no user visible changes after this commit.

gdb/ChangeLog:

	* printcmd.c (skip_over_slash_fmt): Make use of skip_to_space and
	skip_spaces.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1c0029da355..46c9d399be7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-19  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* printcmd.c (skip_over_slash_fmt): Make use of skip_to_space and
+	skip_spaces.
+
 2020-11-18  Keith Seitz  <keiths@redhat.com>
 
 	* linux-tdep.c (dump_note_entry_p): Return true instead of
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 8c05ac8c833..a9c64b97c81 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1261,8 +1261,7 @@ skip_over_slash_fmt (completion_tracker &tracker, const char **args)
       if (ISALNUM (text[1]) || ISSPACE (text[1]))
 	{
 	  /* Skip over the actual format specification.  */
-	  while (*text != '\0' && !ISSPACE (*text))
-	    ++text;
+	  text = skip_to_space (text);
 
 	  if (*text == '\0')
 	    {
@@ -1272,8 +1271,7 @@ skip_over_slash_fmt (completion_tracker &tracker, const char **args)
 	  else
 	    {
 	      in_fmt = false;
-	      while (ISSPACE (*text))
-		++text;
+	      text = skip_spaces (text);
 	    }
 	}
       else if (text[1] == '\0')