From 64b9b33460f8f6063d9d923763bb6909e381b496 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 3 Jun 2011 23:47:46 +0000 Subject: [PATCH] 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. --- gdb/ChangeLog | 6 ++++++ gdb/breakpoint.c | 6 +++--- gdb/breakpoint.h | 4 ++-- gdb/cli/cli-dump.c | 12 ++++++------ gdb/dwarf2expr.c | 4 ++-- gdb/gdbarch.c | 2 +- gdb/gdbarch.sh | 2 +- gdb/remote.c | 2 +- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/help.exp | 18 +++++++++--------- 10 files changed, 37 insertions(+), 25 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b0e7f91eca..773782ce32 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 fe797dd314..32817481bf 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 c7ec3116d6..55c9c34e3f 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 ac6270e645..248529df16 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 e1ddc963e8..23389b8b31 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 7f983067a7..1e65c17d35 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 3112f4465c..a628f8c9e5 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 2c850cbe8a..f245f52596 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 5e1ce3ce25..da8d2fe215 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 a97ec88f9f..0219c7604e 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 -- 2.34.1