From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13875 invoked by alias); 3 Jun 2011 23:52:43 -0000 Received: (qmail 13864 invoked by uid 22791); 3 Jun 2011 23:52:40 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 03 Jun 2011 23:52:24 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id DBE202BB4B0; Fri, 3 Jun 2011 19:52:23 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id NRHcznTHiyrM; Fri, 3 Jun 2011 19:52:23 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 7578D2BB41E; Fri, 3 Jun 2011 19:52:23 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 7AF02145615; Fri, 3 Jun 2011 16:52:20 -0700 (PDT) Date: Fri, 03 Jun 2011 23:52:00 -0000 From: Joel Brobecker To: Stephen Kitt Cc: gdb-patches@sourceware.org Subject: Re: Spelling fixes Message-ID: <20110603235220.GF2661@adacore.com> References: <20110603180316.GI29729@sk2.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="rJwd6BRFiFCcLxzm" Content-Disposition: inline In-Reply-To: <20110603180316.GI29729@sk2.org> User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-06/txt/msg00063.txt.bz2 --rJwd6BRFiFCcLxzm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 619 > The Lintian package validation tool in Debian picked up a few spelling > mistakes in gdb. The following patch fixes these mistakes: Thanks. I applied the fixes using the "obvious" rule (meaning that we don't need to worry about copyright assignment). It seems your sources are a little out of date, as I have a few conflicts when trying to apply the patch. None the less, thank you. We appreciate these contributions. Attached are the patches that I applied to HEAD. There are also the ChangeLog spelling fixes that you made, which are not reproduced here (they are the same as the ones you proposed). -- Joel --rJwd6BRFiFCcLxzm Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="spelling1.diff" Content-length: 1118 commit 196def080e0b875173dce3fedfcd6e0ab8d14ad6 Author: Joel Brobecker Date: Fri Jun 3 16:27:53 2011 -0700 Spelling fixe in sim/ppc/vm.c From Stephen Kitt * vm.c (vm_synchronize_context): Spelling fix in function documentation. diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index d2bec55..2b9017a 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,9 @@ +2011-06-03 Joel Brobecker (obvious fix) + + From Stephen Kitt + * vm.c (vm_synchronize_context): Spelling fix in function + documentation. + 2011-04-16 Mike Frysinger * sim_calls.c (sim_complete_command): New stub function. diff --git a/sim/ppc/vm.c b/sim/ppc/vm.c index bff962c..cfbdda5 100644 --- a/sim/ppc/vm.c +++ b/sim/ppc/vm.c @@ -913,7 +913,7 @@ om_unpack_srs(vm *virtual, #endif -/* Rebuild all the data structures for the new context as specifed by +/* Rebuild all the data structures for the new context as specified by the passed registers */ INLINE_VM\ (void) --rJwd6BRFiFCcLxzm Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="spelling2.diff" Content-length: 18620 commit 2f4a870074817dbde6a0ad1c72f3cca0e90df1ce Author: Joel Brobecker Date: Fri Jun 3 16:33:18 2011 -0700 Various spelling fixes. gdb/ChangeLog: From Stephen Kitt * breakpoint.c, breakpoint.h, cli/cli-dump.c, dwarf2expr.c, gdbarch.c, gdbarch.sh, remote.c: Various spelling fixes. gdb/testsuite/ChangeLog: From Stephen Kitt * gdb.base/help.exp: Adjust following some spelling corrections in GDB. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b0e7f91..773782c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-06-03 Joel Brobecker (obvious fix) + + From Stephen Kitt + * breakpoint.c, breakpoint.h, cli/cli-dump.c, dwarf2expr.c, + gdbarch.c, gdbarch.sh, remote.c: Various spelling fixes. + 2011-06-03 Joel Brobecker * dwarf2expr.c (execute_stack_op) [DW_OP_deref]: Handle diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fe797dd..3281748 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -12997,7 +12997,7 @@ If a breakpoint is hit while enabled in this fashion, it becomes disabled."), Disable some breakpoints.\n\ Arguments are breakpoint numbers with spaces in between.\n\ To disable all breakpoints, give no argument.\n\ -A disabled breakpoint is not forgotten, but has no effect until reenabled."), +A disabled breakpoint is not forgotten, but has no effect until re-enabled."), &disablelist, "disable ", 1, &cmdlist); add_com_alias ("dis", "disable", class_breakpoint, 1); add_com_alias ("disa", "disable", class_breakpoint, 1); @@ -13006,13 +13006,13 @@ A disabled breakpoint is not forgotten, but has no effect until reenabled."), Disable some breakpoints.\n\ Arguments are breakpoint numbers with spaces in between.\n\ To disable all breakpoints, give no argument.\n\ -A disabled breakpoint is not forgotten, but has no effect until reenabled.")); +A disabled breakpoint is not forgotten, but has no effect until re-enabled.")); add_cmd ("breakpoints", class_alias, disable_command, _("\ Disable some breakpoints.\n\ Arguments are breakpoint numbers with spaces in between.\n\ To disable all breakpoints, give no argument.\n\ -A disabled breakpoint is not forgotten, but has no effect until reenabled.\n\ +A disabled breakpoint is not forgotten, but has no effect until re-enabled.\n\ This command may be abbreviated \"disable\"."), &disablelist); diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index c7ec311..55c9c34 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1065,7 +1065,7 @@ extern void delete_std_terminate_breakpoint (void); /* These functions respectively disable or reenable all currently enabled watchpoints. When disabled, the watchpoints are marked - call_disabled. When reenabled, they are marked enabled. + call_disabled. When re-enabled, they are marked enabled. The intended client of these functions is call_function_by_hand. @@ -1079,7 +1079,7 @@ extern void delete_std_terminate_breakpoint (void); and that can cause execution control to become very confused. Note that if a user sets breakpoints in an interactively called - function, the call_disabled watchpoints will have been reenabled + function, the call_disabled watchpoints will have been re-enabled when the first such breakpoint is reached. However, on targets that are unable to unwind through the call dummy frame, watches of stack-based storage may then be deleted, because gdb will diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index ac6270e..248529d 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -679,7 +679,7 @@ _initialize_cli_dump (void) add_dump_command ("memory", dump_memory_command, "\ Write contents of memory to a raw binary file.\n\ Arguments are FILE START STOP. Writes the contents of memory within the\n\ -range [START .. STOP) to the specifed FILE in raw target ordered bytes."); +range [START .. STOP) to the specified FILE in raw target ordered bytes."); add_dump_command ("value", dump_value_command, "\ Write the value of an expression to a raw binary file.\n\ @@ -719,7 +719,7 @@ the specified FILE in raw target ordered bytes."); add_cmd ("memory", all_commands, dump_srec_memory, _("\ Write contents of memory to an srec file.\n\ Arguments are FILE START STOP. Writes the contents of memory\n\ -within the range [START .. STOP) to the specifed FILE in srec format."), +within the range [START .. STOP) to the specified FILE in srec format."), &srec_cmdlist); add_cmd ("value", all_commands, dump_srec_value, _("\ @@ -731,7 +731,7 @@ to the specified FILE in srec format."), add_cmd ("memory", all_commands, dump_ihex_memory, _("\ Write contents of memory to an ihex file.\n\ Arguments are FILE START STOP. Writes the contents of memory within\n\ -the range [START .. STOP) to the specifed FILE in intel hex format."), +the range [START .. STOP) to the specified FILE in intel hex format."), &ihex_cmdlist); add_cmd ("value", all_commands, dump_ihex_value, _("\ @@ -743,7 +743,7 @@ to the specified FILE in intel hex format."), add_cmd ("memory", all_commands, dump_tekhex_memory, _("\ Write contents of memory to a tekhex file.\n\ Arguments are FILE START STOP. Writes the contents of memory\n\ -within the range [START .. STOP) to the specifed FILE in tekhex format."), +within the range [START .. STOP) to the specified FILE in tekhex format."), &tekhex_cmdlist); add_cmd ("value", all_commands, dump_tekhex_value, _("\ @@ -755,7 +755,7 @@ to the specified FILE in tekhex format."), add_cmd ("memory", all_commands, dump_binary_memory, _("\ Write contents of memory to a raw binary file.\n\ Arguments are FILE START STOP. Writes the contents of memory\n\ -within the range [START .. STOP) to the specifed FILE in binary format."), +within the range [START .. STOP) to the specified FILE in binary format."), &binary_dump_cmdlist); add_cmd ("value", all_commands, dump_binary_value, _("\ @@ -767,7 +767,7 @@ to the specified FILE in raw target ordered bytes."), add_cmd ("memory", all_commands, append_binary_memory, _("\ Append contents of memory to a raw binary file.\n\ Arguments are FILE START STOP. Writes the contents of memory within the\n\ -range [START .. STOP) to the specifed FILE in raw target ordered bytes."), +range [START .. STOP) to the specified FILE in raw target ordered bytes."), &binary_append_cmdlist); add_cmd ("value", all_commands, append_binary_value, _("\ diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c index e1ddc96..23389b8 100644 --- a/gdb/dwarf2expr.c +++ b/gdb/dwarf2expr.c @@ -437,7 +437,7 @@ dwarf_expr_require_composition (const gdb_byte *op_ptr, const gdb_byte *op_end, checked at the other place that this function is called. */ if (op_ptr != op_end && *op_ptr != DW_OP_piece && *op_ptr != DW_OP_bit_piece) error (_("DWARF-2 expression error: `%s' operations must be " - "used either alone or in conjuction with DW_OP_piece " + "used either alone or in conjunction with DW_OP_piece " "or DW_OP_bit_piece."), op_name); } @@ -662,7 +662,7 @@ execute_stack_op (struct dwarf_expr_context *ctx, && *op_ptr != DW_OP_bit_piece && *op_ptr != DW_OP_GNU_uninit) error (_("DWARF-2 expression error: DW_OP_reg operations must be " - "used either alone or in conjuction with DW_OP_piece " + "used either alone or in conjunction with DW_OP_piece " "or DW_OP_bit_piece.")); result = op - DW_OP_reg0; diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 7f98306..1e65c17 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -4030,7 +4030,7 @@ gdbarch_register (enum bfd_architecture bfd_architecture, { if (bfd_architecture == (*curr)->bfd_architecture) internal_error (__FILE__, __LINE__, - _("gdbarch: Duplicate registraration " + _("gdbarch: Duplicate registration " "of architecture (%s)"), bfd_arch_info->printable_name); } diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 3112f44..a628f8c 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1949,7 +1949,7 @@ gdbarch_register (enum bfd_architecture bfd_architecture, { if (bfd_architecture == (*curr)->bfd_architecture) internal_error (__FILE__, __LINE__, - _("gdbarch: Duplicate registraration " + _("gdbarch: Duplicate registration " "of architecture (%s)"), bfd_arch_info->printable_name); } diff --git a/gdb/remote.c b/gdb/remote.c index 2c850cb..f245f52 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6229,7 +6229,7 @@ check_binary_download (CORE_ADDR addr) { if (remote_debug) fprintf_unfiltered (gdb_stdlog, - "binary downloading suppported by target\n"); + "binary downloading supported by target\n"); remote_protocol_packets[PACKET_X].support = PACKET_ENABLE; } break; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5e1ce3c..da8d2fe 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-06-03 Joel Brobecker (obvious fix) + + From Stephen Kitt + * gdb.base/help.exp: Adjust following some spelling corrections + in GDB. + 2011-06-01 Yao Qi * gdb.base/ending-run.exp: Match __uClibc_main for uClibc. diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index a97ec88..0219c76 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -38,9 +38,9 @@ test_class_help "aliases" {"Aliases of other commands\.\[\r\n\]+"} # test help append gdb_test "help append" "Append target code/data to a local file\.\[\r\n\]+List of append subcommands:.*" gdb_test "help append binary" "Append target code/data to a raw binary file\.\[\r\n\]+List of append binary subcommands:.*" -gdb_test "help append memory" "Append contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specifed FILE in raw target ordered bytes\." +gdb_test "help append memory" "Append contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specified FILE in raw target ordered bytes\." gdb_test "help append value" "Append the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION to\[\r\n\]+the specified FILE in raw target ordered bytes\." -gdb_test "help append binary memory" "Append contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specifed FILE in raw target ordered bytes\." +gdb_test "help append binary memory" "Append contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specified FILE in raw target ordered bytes\." gdb_test "help append binary value" "Append the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in raw target ordered bytes\." # test help attach gdb_test "help attach" "Attach to a process or file outside of GDB\.\[\r\n\]+This command attaches to another target, of the same type as your last\[\r\n\]+\"target\" command \\(\"info files\" will show your target stack\\)\.\[\r\n\]+The command may take as argument a process id or a device file\.\[\r\n\]+For a process id, you must have permission to send the process a signal,\[\r\n\]+and it must have the same effective uid as the debugger\.\[\r\n\]+When using \"attach\" with a process id, the debugger finds the\[\r\n\]+program running in the process, looking first in the current working\[\r\n\]+directory, or \\(if not found there\\) using the source file search path\[\r\n\]+\\(see the \"directory\" command\\)\. You can also use the \"file\" command\[\r\n\]+to specify the program, and to load its symbol table\." "help attach" @@ -110,7 +110,7 @@ set expected_help_disable { "Disable some breakpoints\.\[\r\n\]+" "Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+" "To disable all breakpoints, give no argument\.\[\r\n\]+" - "A disabled breakpoint is not forgotten, but has no effect until reenabled\.\[\r\n\]+" + "A disabled breakpoint is not forgotten, but has no effect until re-enabled\.\[\r\n\]+" } test_prefix_command_help {"dis" "disable"} $expected_help_disable "help disable \"dis\" abbreviation" # test help disable "disa" abbreviation @@ -118,7 +118,7 @@ test_prefix_command_help {"disa" "disable"} $expected_help_disable "help disable # test help disable test_prefix_command_help "disable" $expected_help_disable # test help disable breakpoints -gdb_test "help disable breakpoints" "Disable some breakpoints\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To disable all breakpoints, give no argument\.\[\r\n\]+A disabled breakpoint is not forgotten, but has no effect until reenabled\.\[\r\n\]+This command may be abbreviated \"disable\"." "help disable breakpoints" +gdb_test "help disable breakpoints" "Disable some breakpoints\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To disable all breakpoints, give no argument\.\[\r\n\]+A disabled breakpoint is not forgotten, but has no effect until re-enabled\.\[\r\n\]+This command may be abbreviated \"disable\"." "help disable breakpoints" # test help disable display gdb_test "help disable display" "Disable some expressions to be displayed when program stops\.\[\r\n\]+Arguments are the code numbers of the expressions to stop displaying\.\[\r\n\]+No argument means disable all automatic-display expressions\.\[\r\n\]+Do \"info display\" to see current list of code numbers\." "help disable display" # test help disassemble @@ -137,17 +137,17 @@ gdb_test "help down-silently" "Same as the `down' command, but does not print an gdb_test "help dump" "Dump target code/data to a local file\.\[\r\n\]+List of dump subcommands:.*" gdb_test "help dump binary" "Write target code/data to a raw binary file\.\[\r\n\]+List of dump binary subcommands:.*" gdb_test "help dump ihex" "Write target code/data to an intel hex file\.\[\r\n\]+List of dump ihex subcommands:.*" -gdb_test "help dump memory" "Write contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specifed FILE in raw target ordered bytes\." +gdb_test "help dump memory" "Write contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specified FILE in raw target ordered bytes\." gdb_test "help dump srec" "Write target code/data to an srec file\.\[\r\n\]+List of dump srec subcommands:.*" gdb_test "help dump tekhex" "Write target code/data to a tekhex file\.\[\r\n\]+List of dump tekhex subcommands:.*" gdb_test "help dump value" "Write the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION to\[\r\n\]+the specified FILE in raw target ordered bytes\." -gdb_test "help dump binary memory" "Write contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specifed FILE in binary format\." +gdb_test "help dump binary memory" "Write contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specified FILE in binary format\." gdb_test "help dump binary value" "Write the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in raw target ordered bytes\." "help dump binary value" -gdb_test "help dump ihex memory" "Write contents of memory to an ihex file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within\[\r\n\]+the range \\\[START \.\. STOP\\) to the specifed FILE in intel hex format\." +gdb_test "help dump ihex memory" "Write contents of memory to an ihex file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory within\[\r\n\]+the range \\\[START \.\. STOP\\) to the specified FILE in intel hex format\." gdb_test "help dump ihex value" "Write the value of an expression to an ihex file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in intel hex format\." -gdb_test "help dump srec memory" "Write contents of memory to an srec file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specifed FILE in srec format\." +gdb_test "help dump srec memory" "Write contents of memory to an srec file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specified FILE in srec format\." gdb_test "help dump srec value" "Write the value of an expression to an srec file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in srec format\." -gdb_test "help dump tekhex memory" "Write contents of memory to a tekhex file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specifed FILE in tekhex format\." +gdb_test "help dump tekhex memory" "Write contents of memory to a tekhex file\.\[\r\n\]+Arguments are FILE START STOP\. Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specified FILE in tekhex format\." gdb_test "help dump tekhex value" "Write the value of an expression to a tekhex file\.\[\r\n\]+Arguments are FILE EXPRESSION\. Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in tekhex format\." # this command was removed from GDB 4.5.8 # test help dump-me --rJwd6BRFiFCcLxzm--