diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/ax-gdb.c | 5 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 6 | ||||
| -rw-r--r-- | gdb/charset.c | 8 | ||||
| -rw-r--r-- | gdb/cp-abi.c | 6 | ||||
| -rw-r--r-- | gdb/infcall.c | 91 | ||||
| -rw-r--r-- | gdb/infrun.c | 9 | ||||
| -rw-r--r-- | gdb/linux-nat.c | 11 | ||||
| -rw-r--r-- | gdb/solib-pa64.c | 9 | ||||
| -rw-r--r-- | gdb/solib-som.c | 37 |
10 files changed, 102 insertions, 92 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b1edadf..26caad8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2011-01-07 Michael Snyder <msnyder@vmware.com> + + * ax-gdb.c: Adjust some long output strings. + * breakpoint.c: Ditto. + * charset.c: Ditto. + * cp-abi.c: Ditto. + * infcall.c: Ditto. + * infrun.c: Ditto. + * linux-nat.c: Ditto. + * solib-pa64.c: Ditto. + * solib-som.c: Ditto. + 2011-01-06 Tom Tromey <tromey@redhat.com> PR python/12367: diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 8094710..2908431 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -1094,8 +1094,9 @@ gen_ptrdiff (struct agent_expr *ax, struct axs_value *value, if (TYPE_LENGTH (TYPE_TARGET_TYPE (value1->type)) != TYPE_LENGTH (TYPE_TARGET_TYPE (value2->type))) - error (_("First argument of `-' is a pointer, but second argument " - "is neither\nan integer nor a pointer of the same type.")); + error (_("\ +First argument of `-' is a pointer, but second argument is neither\n\ +an integer nor a pointer of the same type.")); ax_simple (ax, aop_sub); gen_scale (ax, aop_div_unsigned, value1->type); diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 97efc0a..a909aa3 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1538,9 +1538,9 @@ update_watchpoint (struct breakpoint *b, int reparse) } else if (!within_current_scope) { - printf_filtered (_("Watchpoint %d deleted because " - "the program has left the block\n" - "in which its expression is valid.\n"), + printf_filtered (_("\ +Watchpoint %d deleted because the program has left the block\n\ +in which its expression is valid.\n"), b->number); if (b->related_breakpoint) { diff --git a/gdb/charset.c b/gdb/charset.c index d54749c..66cb567 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -981,8 +981,8 @@ Set the host character set."), _("\ Show the host character set."), _("\ The `host character set' is the one used by the system GDB is running on.\n\ You may only use supersets of ASCII for your host character set; GDB does\n\ -not support any others.\nTo see a list of the character sets GDB supports, \ -type `set host-charset <TAB>'."), +not support any others.\n\ +To see a list of the character sets GDB supports, type `set host-charset <TAB>'."), set_host_charset_sfunc, show_host_charset_name, &setlist, &showlist); @@ -993,8 +993,8 @@ Set the target character set."), _("\ Show the target character set."), _("\ The `target character set' is the one used by the program being debugged.\n\ GDB translates characters and strings between the host and target\n\ -character sets as needed.\nTo see a list of the character sets GDB supports, \ -type `set target-charset'<TAB>"), +character sets as needed.\n +To see a list of the character sets GDB supports, type `set target-charset'<TAB>"), set_target_charset_sfunc, show_target_charset_name, &setlist, &showlist); diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index 4f9a062..0c21f91 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -309,9 +309,9 @@ _initialize_cp_abi (void) register_cp_abi (&auto_cp_abi); switch_to_cp_abi ("auto"); - add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, - _("Set the ABI used for inspecting C++ objects.\n\"set cp-abi\" " - "with no arguments will list the available ABIs."), + add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, _("\ +Set the ABI used for inspecting C++ objects.\n\ +\"set cp-abi\" with no arguments will list the available ABIs."), &setlist); add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd, diff --git a/gdb/infcall.c b/gdb/infcall.c index 48c183e..81b6085 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -825,12 +825,11 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) switch (e.reason) { case RETURN_ERROR: - throw_error (e.error, - _("%s\nAn error occurred while in a " - "function called from GDB.\n Evaluation " - "of the expression containing the function\n " - "(%s) will be abandoned.\nWhen the function " - "is done executing, GDB will silently stop."), + throw_error (e.error, _("%s\n\ +An error occurred while in a function called from GDB.\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned.\n\ +When the function is done executing, GDB will silently stop."), e.message, name); case RETURN_QUIT: default: @@ -874,18 +873,19 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) /* Keep the dummy frame record, if the user switches back to the thread with the hand-call, we'll need it. */ if (stopped_by_random_signal) - error (_("The program received a signal in another thread while\n" - "making a function call from GDB.\nEvaluation " - "of the expression containing the function\n" - "(%s) will be abandoned.\nWhen the function " - "is done executing, GDB will silently stop."), + error (_("\ +The program received a signal in another thread while\n\ +making a function call from GDB.\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned.\n\ +When the function is done executing, GDB will silently stop."), name); else - error (_("The program stopped in another thread while making " - "a function call from GDB.\nEvaluation " - "of the expression containing the function\n" - "(%s) will be abandoned.\nWhen the function " - "is done executing, GDB will silently stop."), + error (_("\ +The program stopped in another thread while making a function call from GDB.\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned.\n\ +When the function is done executing, GDB will silently stop."), name); } @@ -914,12 +914,12 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ - error (_("The program being debugged was signaled while " - "in a function called from GDB.\nGDB has restored " - "the context to what it was before the call.\n " - "To change this behavior use \"set unwindonsignal " - "off\".\nEvaluation of the expression containing " - "the function\n(%s) will be abandoned."), + error (_("\ +The program being debugged was signaled while in a function called from GDB.\n\ +GDB has restored the context to what it was before the call.\n\ +To change this behavior use \"set unwindonsignal off\".\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned."), name); } else @@ -932,14 +932,13 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ - error (_("The program being debugged was signaled while " - "in a function called from GDB.\nGDB remains in " - "the frame where the signal was received.\nTo change " - "this behavior use \"set unwindonsignal on\".\n" - "Evaluation of the expression containing the " - "function\n(%s) will be abandoned.\n" - "When the function is done executing, GDB will " - "silently stop."), + error (_("\ +The program being debugged was signaled while in a function called from GDB.\n\ +GDB remains in the frame where the signal was received.\n\ +To change this behavior use \"set unwindonsignal on\".\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned.\n\ +When the function is done executing, GDB will silently stop."), name); } } @@ -954,18 +953,14 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) the dummy call. */ restore_infcall_control_state (inf_status); - error (_("The program being debugged entered a " - "std::terminate call, most likely\n" - "caused by an unhandled C++ exception. " - "GDB blocked this call in order\n" - "to prevent the program from being " - "terminated, and has restored the\n" - "context to its original state before the call.\n" - "To change this behaviour use \"set " - "unwind-on-terminating-exception off\".\n" - "Evaluation of the expression " - "containing the function (%s)\n" - "will be abandoned."), + error (_("\ +The program being debugged entered a std::terminate call, most likely\n\ +caused by an unhandled C++ exception. GDB blocked this call in order\n\ +to prevent the program from being terminated, and has restored the\n\ +context to its original state before the call.\n\ +To change this behaviour use \"set unwind-on-terminating-exception off\".\n\ +Evaluation of the expression containing the function (%s)\n\ +will be abandoned."), name); } else if (stop_stack_dummy == STOP_NONE) @@ -985,13 +980,11 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) someday this will be implemented (it would not be easy). */ /* FIXME: Insert a bunch of wrap_here; name can be very long if it's a C++ name with arguments and stuff. */ - error (_("The program being debugged stopped " - "while in a function called from GDB.\n" - "Evaluation of the expression " - "containing the function\n" - "(%s) will be abandoned.\n" - "When the function is done executing, " - "GDB will silently stop."), + error (_("\ +The program being debugged stopped while in a function called from GDB.\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned.\n\ +When the function is done executing, GDB will silently stop."), name); } diff --git a/gdb/infrun.c b/gdb/infrun.c index dd6fe6c..a6d0038 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1623,11 +1623,10 @@ resume (int step, enum target_signal sig) if (gdbarch_skip_permanent_breakpoint_p (gdbarch)) gdbarch_skip_permanent_breakpoint (gdbarch, regcache); else - error (_("The program is stopped at a permanent " - "breakpoint, but GDB does not know\n" - "how to step past a permanent breakpoint " - "on this architecture. Try using\na command " - "like `return' or `jump' to continue execution.")); + error (_("\ +The program is stopped at a permanent breakpoint, but GDB does not know\n\ +how to step past a permanent breakpoint on this architecture. Try using\n\ +a command like `return' or `jump' to continue execution.")); } /* If enabled, step over breakpoints by executing a copy of the diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index e467e9a..ec0433f 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -686,12 +686,11 @@ linux_child_follow_fork (struct target_ops *ops, int follow_child) the parent stays blocked. If we're telling the parent to run in the foreground, the user will not be able to ctrl-c to get back the terminal, effectively hanging the debug session. */ - fprintf_filtered (gdb_stderr, - _("Can not resume the parent process " - "over vfork in the foreground while\n" - "holding the child stopped. " - "Try \"set detach-on-fork\" or " - "\"set schedule-multiple\".\n")); + fprintf_filtered (gdb_stderr, _("\ +Can not resume the parent process over vfork in the foreground while\n\ +holding the child stopped. Try \"set detach-on-fork\" or \ +\"set schedule-multiple\".\n")); + /* FIXME output string > 80 columns. */ return 1; } diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c index 262682c..c26fc62 100644 --- a/gdb/solib-pa64.c +++ b/gdb/solib-pa64.c @@ -360,10 +360,11 @@ pa64_solib_create_inferior_hook (int from_tty) /* If the libraries were not mapped private, warn the user. */ if ((dld_cache.dld_flags & DT_HP_DEBUG_PRIVATE) == 0) warning - (_("Private mapping of shared library text was not specified\n" - "by the executable; setting a breakpoint in a shared library which\n" - "is not privately mapped will not work. See the HP-UX 11i v3 chatr\n" - "manpage for methods to privately map shared library text.")); + (_("\ +Private mapping of shared library text was not specified\n\ +by the executable; setting a breakpoint in a shared library which\n\ +is not privately mapped will not work. See the HP-UX 11i v3 chatr\n\ +manpage for methods to privately map shared library text.")); /* Turn on the flags we care about. */ dld_cache.dld_flags |= DT_HP_DEBUG_CALLBACK; diff --git a/gdb/solib-som.c b/gdb/solib-som.c index 23fe9c2..d1522ff 100644 --- a/gdb/solib-som.c +++ b/gdb/solib-som.c @@ -225,9 +225,10 @@ som_solib_create_inferior_hook (int from_tty) status = target_write_memory (anaddr, buf, 4); if (status != 0) { - warning (_("Unable to write __d_pid.\n" - "Suggest linking with /opt/langtools/lib/end.o.\n" - "GDB will be unable to track shl_load/shl_unload calls")); + warning (_("\ +Unable to write __d_pid.\n\ +Suggest linking with /opt/langtools/lib/end.o.\n\ +GDB will be unable to track shl_load/shl_unload calls")); goto keep_going; } @@ -245,9 +246,10 @@ som_solib_create_inferior_hook (int from_tty) msymbol = lookup_minimal_symbol ("__d_trap", NULL, symfile_objfile); if (msymbol == NULL) { - warning (_("Unable to find _DLD_HOOK symbol in object file.\n" - "Suggest linking with /opt/langtools/lib/end.o.\n" - "GDB will be unable to track shl_load/shl_unload calls")); + warning (_("\ +Unable to find _DLD_HOOK symbol in object file.\n\ +Suggest linking with /opt/langtools/lib/end.o.\n\ +GDB will be unable to track shl_load/shl_unload calls")); goto keep_going; } anaddr = SYMBOL_VALUE_ADDRESS (msymbol); @@ -267,9 +269,10 @@ som_solib_create_inferior_hook (int from_tty) msymbol = lookup_minimal_symbol ("__dld_hook", NULL, symfile_objfile); if (msymbol == NULL) { - warning (_("Unable to find __dld_hook symbol in object file.\n" - "Suggest linking with /opt/langtools/lib/end.o.\n" - "GDB will be unable to track shl_load/shl_unload calls")); + warning (_("\ +Unable to find __dld_hook symbol in object file.\n\ +Suggest linking with /opt/langtools/lib/end.o.\n\ +GDB will be unable to track shl_load/shl_unload calls")); goto keep_going; } anaddr = SYMBOL_VALUE_ADDRESS (msymbol); @@ -280,9 +283,10 @@ som_solib_create_inferior_hook (int from_tty) msymbol = lookup_minimal_symbol ("__d_trap", NULL, symfile_objfile); if (msymbol == NULL) { - warning (_("Unable to find __dld_d_trap symbol in object file.\n" - "Suggest linking with /opt/langtools/lib/end.o.\n" - "GDB will be unable to track shl_load/shl_unload calls")); + warning (_("\ +Unable to find __dld_d_trap symbol in object file.\n\ +Suggest linking with /opt/langtools/lib/end.o.\n\ +GDB will be unable to track shl_load/shl_unload calls")); goto keep_going; } create_solib_event_breakpoint (target_gdbarch, @@ -318,10 +322,11 @@ keep_going: && (dl_header.flags & SHLIB_TEXT_PRIVATE_ENABLE) == 0 && (dld_flags & DLD_FLAGS_MAPPRIVATE) == 0) warning - (_("Private mapping of shared library text was not specified\n" - "by the executable; setting a breakpoint in a shared library which\n" - "is not privately mapped will not work. See the HP-UX 11i v3 chatr\n" - "manpage for methods to privately map shared library text.")); + (_("\ +Private mapping of shared library text was not specified\n\ +by the executable; setting a breakpoint in a shared library which\n\ +is not privately mapped will not work. See the HP-UX 11i v3 chatr\n\ +manpage for methods to privately map shared library text.")); /* Turn on the flags we care about. */ if (get_hpux_major_release () < 11) |