From 2e74121d77ccfd8353d64fd8a2ec8a5fbb881967 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 18 Nov 2008 00:13:04 +0000 Subject: [PATCH] * infcall.c (call_function_by_hand): Fix punctuation and capitalization on error messages. * gdb.mi/mi-syn-frame.exp: Update expected output. * gdb.mi/mi2-syn-frame.exp: Update expected output. --- gdb/ChangeLog | 5 +++++ gdb/infcall.c | 8 ++++---- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.mi/mi-syn-frame.exp | 2 +- gdb/testsuite/gdb.mi/mi2-syn-frame.exp | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e70bea18ccb..27eb67c266e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-11-17 Doug Evans + + * infcall.c (call_function_by_hand): Fix punctuation and capitalization + on error messages. + 2008-11-17 Ulrich Weigand PR gdb/2250 diff --git a/gdb/infcall.c b/gdb/infcall.c index aa3bee0999a..b2ca4855ccb 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -339,7 +339,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) gdbarch = get_frame_arch (frame); if (!gdbarch_push_dummy_call_p (gdbarch)) - error (_("This target does not support function calls")); + error (_("This target does not support function calls.")); /* Create a cleanup chain that contains the retbuf (buffer containing the register values). This chain is create BEFORE the @@ -529,7 +529,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) } if (nargs < TYPE_NFIELDS (ftype)) - error (_("too few arguments in function call")); + error (_("Too few arguments in function call.")); { int i; @@ -754,7 +754,7 @@ The program being debugged exited while in a function called from GDB.")); 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\ +To change this behavior use \"set unwindonsignal off\".\n\ Evaluation of the expression containing the function (%s) will be abandoned."), name); } @@ -774,7 +774,7 @@ Evaluation of the expression containing the function (%s) will be abandoned."), 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\ +To change this behavior use \"set unwindonsignal on\".\n\ Evaluation of the expression containing the function (%s) will be abandoned."), name); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 58b2a2a176e..ba31a1d889e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-11-17 Doug Evans + + * gdb.mi/mi-syn-frame.exp: Update expected output. + * gdb.mi/mi2-syn-frame.exp: Update expected output. + 2008-11-17 Vladimir Prus * gdb.mi/mi-pthreads.exp (check_mi_thread_command_set): Make sure diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp index ad0c439aa47..4beb88cb255 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -92,7 +92,7 @@ mi_gdb_test "409-stack-list-frames 0 0" \ # mi_gdb_test "410-data-evaluate-expression bar()" \ - ".*410\\^error,msg=\"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\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" \ + ".*410\\^error,msg=\"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\\\\\".\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" \ "call inferior function which raises exception" mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception" diff --git a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp index 8345c6a43d7..93484467516 100644 --- a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp @@ -92,7 +92,7 @@ mi_gdb_test "409-stack-list-frames 0 0" \ # Call bar() by hand, which should get an exception while running. # -mi_gdb_test "410-data-evaluate-expression bar()" ".*410\\^error,msg=\"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\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" "call inferior function which raises exception" +mi_gdb_test "410-data-evaluate-expression bar()" ".*410\\^error,msg=\"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\\\\\".\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" "call inferior function which raises exception" mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception" -- 2.30.2