2011-01-05 Michael Snyder <msnyder@vmware.com>

[deliverable/binutils-gdb.git] / gdb / infcall.c

diff --git a/gdb/infcall.c b/gdb/infcall.c
index 85b814a54f958e20dbd050f48d2c17587c2c1d66..48c183e39be88d7064c853640c3d82715b9db6bf 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -77,8 +77,9 @@ static void
 show_coerce_float_to_double_p (struct ui_file *file, int from_tty,
                               struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file, _("\
-Coercion of floats to doubles when calling functions is %s.\n"),
+  fprintf_filtered (file,
+                   _("Coercion of floats to doubles "
+                     "when calling functions is %s.\n"),
                    value);
 }
 
@@ -94,8 +95,9 @@ static void
 show_unwind_on_signal_p (struct ui_file *file, int from_tty,
                         struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file, _("\
-Unwinding of stack if a signal is received while in a call dummy is %s.\n"),
+  fprintf_filtered (file,
+                   _("Unwinding of stack if a signal is "
+                     "received while in a call dummy is %s.\n"),
                    value);
 }
 
@@ -119,8 +121,9 @@ show_unwind_on_terminating_exception_p (struct ui_file *file, int from_tty,
                                        const char *value)
 
 {
-  fprintf_filtered (file, _("\
-Unwind stack if a C++ exception is unhandled while in a call dummy is %s.\n"),
+  fprintf_filtered (file,
+                   _("Unwind stack if a C++ exception is "
+                     "unhandled while in a call dummy is %s.\n"),
                    value);
 }
 
@@ -822,12 +825,12 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
       switch (e.reason)
        {
        case RETURN_ERROR:
-         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."),
+         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."),
                       e.message, name);
        case RETURN_QUIT:
        default:
@@ -851,10 +854,10 @@ When the function is done executing, GDB will silently stop."),
          but it will get garbage collected the next time the program is
          run anyway.  */
 
-      error (_("\
-The program being debugged exited while in a function called from GDB.\n\
-Evaluation of the expression containing the function\n\
-(%s) will be abandoned."),
+      error (_("The program being debugged exited while in a function "
+              "called from GDB.\n"
+              "Evaluation of the expression containing the function\n"
+              "(%s) will be abandoned."),
             name);
     }
 
@@ -871,19 +874,18 @@ Evaluation of the expression containing the function\n\
       /* 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.\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 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."),
               name);
       else
-       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."),
+       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."),
               name);
     }
 
@@ -912,12 +914,12 @@ When the function is done executing, GDB will silently stop."),
 
              /* 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.\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."),
+             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."),
                     name);
            }
          else
@@ -930,13 +932,14 @@ Evaluation of the expression containing the function\n\
 
              /* 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.\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."),
+             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."),
                     name);
            }
        }
@@ -951,14 +954,18 @@ When the function is done executing, GDB will silently stop."),
             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)
@@ -978,11 +985,13 @@ will be abandoned."),
             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);
        }
 
@@ -1079,7 +1088,8 @@ The default is to stop in the frame where the signal was received."),
   add_setshow_boolean_cmd ("unwind-on-terminating-exception", no_class,
                           &unwind_on_terminating_exception_p, _("\
 Set unwinding of stack if std::terminate is called while in call dummy."), _("\
-Show unwinding of stack if std::terminate() is called while in a call dummy."), _("\
+Show unwinding of stack if std::terminate() is called while in a call dummy."),
+                          _("\
 The unwind on terminating exception flag lets the user determine\n\
 what gdb should do if a std::terminate() call is made from the\n\
 default exception handler.  If set, gdb unwinds the stack and restores\n\