From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1256) id 483E43851C13; Wed, 29 Jun 2022 14:28:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 483E43851C13 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Maciej W. Rozycki To: gdb-cvs@sourceware.org Subject: [binutils-gdb] GDB: Remove extraneous full stops from `set' command error messages X-Act-Checkin: binutils-gdb X-Git-Author: Maciej W. Rozycki X-Git-Refname: refs/heads/master X-Git-Oldrev: 6c0fe6d8f963eee3da16bf4895b1c592596240ff X-Git-Newrev: 575fd4cffd05be7bd56112afa8688201d70d3043 Message-Id: <20220629142857.483E43851C13@sourceware.org> Date: Wed, 29 Jun 2022 14:28:57 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 14:28:57 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D575fd4cffd05= be7bd56112afa8688201d70d3043 commit 575fd4cffd05be7bd56112afa8688201d70d3043 Author: Maciej W. Rozycki Date: Wed Jun 29 15:27:41 2022 +0100 GDB: Remove extraneous full stops from `set' command error messages =20 With errors given for bad commands such as `set annotate' or `set width' we produce an extraneous full stop within parentheses: =20 (gdb) set annotate Argument required (integer to set it to.). (gdb) set width Argument required (integer to set it to, or "unlimited".). (gdb) =20 This is grammatically incorrect, so remove the full stop and adjust the testsuite accordingly. Diff: --- gdb/cli/cli-setshow.c | 10 +++++----- gdb/testsuite/gdb.base/with.exp | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) 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 =3D=3D nullptr || **arg =3D=3D '\0') { if (var_type =3D=3D 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")); } =20 if (var_type =3D=3D var_uinteger && is_unlimited_literal (arg, expressio= n)) @@ -228,7 +228,7 @@ parse_cli_var_zuinteger_unlimited (const char **arg, bo= ol expression) LONGEST val; =20 if (*arg =3D=3D nullptr || **arg =3D=3D '\0') - error_no_arg (_("integer to set it to, or \"unlimited\".")); + error_no_arg (_("integer to set it to, or \"unlimited\"")); =20 if (is_unlimited_literal (arg, expression)) val =3D -1; @@ -418,9 +418,9 @@ do_set_command (const char *arg, int from_tty, struct c= md_list_element *c) if (*arg =3D=3D '\0') { if (c->var->type () =3D=3D 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")); } =20 if (c->var->type () =3D=3D var_integer && is_unlimited_literal (&arg, tru= e)) 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" =20 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\"\\)\\." =20 gdb_test "with -- p 1" \ "Missing setting before '--' delimiter"