From: Maciej W. Rozycki <macro@embecosm.com>
Date: Wed, 29 Jun 2022 14:27:41 +0000 (+0100)
Subject: GDB: Remove extraneous full stops from `set' command error messages
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=575fd4cffd05be7bd56112afa8688201d70d3043;p=binutils-gdb.git

GDB: Remove extraneous full stops from `set' command error messages

With errors given for bad commands such as `set annotate' or `set width'
we produce an extraneous full stop within parentheses:

(gdb) set annotate
Argument required (integer to set it to.).
(gdb) set width
Argument required (integer to set it to, or "unlimited".).
(gdb)

This is grammatically incorrect, so remove the full stop and adjust the
testsuite accordingly.
---

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 213573e443e..139ebaf8323 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -195,9 +195,9 @@ parse_cli_var_uinteger (var_types var_type, const char **arg,
   if (*arg == nullptr || **arg == '\0')
     {
       if (var_type == var_uinteger)
-	error_no_arg (_("integer to set it to, or \"unlimited\"."));
+	error_no_arg (_("integer to set it to, or \"unlimited\""));
       else
-	error_no_arg (_("integer to set it to."));
+	error_no_arg (_("integer to set it to"));
     }
 
   if (var_type == var_uinteger && is_unlimited_literal (arg, expression))
@@ -228,7 +228,7 @@ parse_cli_var_zuinteger_unlimited (const char **arg, bool expression)
   LONGEST val;
 
   if (*arg == nullptr || **arg == '\0')
-    error_no_arg (_("integer to set it to, or \"unlimited\"."));
+    error_no_arg (_("integer to set it to, or \"unlimited\""));
 
   if (is_unlimited_literal (arg, expression))
     val = -1;
@@ -418,9 +418,9 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
 	if (*arg == '\0')
 	  {
 	    if (c->var->type () == var_integer)
-	      error_no_arg (_("integer to set it to, or \"unlimited\"."));
+	      error_no_arg (_("integer to set it to, or \"unlimited\""));
 	    else
-	      error_no_arg (_("integer to set it to."));
+	      error_no_arg (_("integer to set it to"));
 	  }
 
 	if (c->var->type () == var_integer && is_unlimited_literal (&arg, true))
diff --git a/gdb/testsuite/gdb.base/with.exp b/gdb/testsuite/gdb.base/with.exp
index 6cde27dc29b..ca19a18b03f 100644
--- a/gdb/testsuite/gdb.base/with.exp
+++ b/gdb/testsuite/gdb.base/with.exp
@@ -99,14 +99,14 @@ with_test_prefix "maint" {
     test_with_error "boolean" "2" "\"on\" or \"off\" expected\\."
     test_with_error "uinteger" "-1" "integer -1 out of range"
     test_with_error "uinteger" "" \
-	"Argument required \\(integer to set it to, or \"unlimited\"\\.\\)\\."
+	"Argument required \\(integer to set it to, or \"unlimited\"\\)\\."
     test_with_error "zuinteger" "-1" "integer -1 out of range"
     test_with_error "zuinteger" "" \
-	"Argument required \\(integer to set it to\\.\\)\\."
+	"Argument required \\(integer to set it to\\)\\."
     test_with_error "zuinteger-unlimited" "-2" \
 	"only -1 is allowed to set as unlimited"
     test_with_error "zuinteger-unlimited" "" \
-	"Argument required \\(integer to set it to, or \"unlimited\"\\.\\)\\."
+	"Argument required \\(integer to set it to, or \"unlimited\"\\)\\."
     test_with_error "filename" "" \
 	"Argument required \\(filename to set it to\\.\\)\\."
     test_with_error "enum" "" \
@@ -243,7 +243,7 @@ with_test_prefix "errors" {
 	"Cannot use this setting with the \"with\" command"
 
     gdb_test "with print elements -- p 1" \
-	"Argument required \\(integer to set it to, or \"unlimited\"\\.\\)\\."
+	"Argument required \\(integer to set it to, or \"unlimited\"\\)\\."
 
     gdb_test "with -- p 1" \
 	"Missing setting before '--' delimiter"