aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2002-04-10 23:32:33 +0000
committerAndrew Cagney <cagney@redhat.com>2002-04-10 23:32:33 +0000
commitd8c0a2e707057364978b1cbe59d73d9bc929e0a6 (patch)
tree8103b4ce8bbeeec69feb5743ab5d230239acfb57
parent7cc19214aa83761f61b42a8eed01732d39495972 (diff)
downloadgdb-d8c0a2e707057364978b1cbe59d73d9bc929e0a6.zip
gdb-d8c0a2e707057364978b1cbe59d73d9bc929e0a6.tar.gz
gdb-d8c0a2e707057364978b1cbe59d73d9bc929e0a6.tar.bz2
* stack.c (select_frame): Cleanup internal error message, do not
use %p.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/stack.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 39a50f3..e3f3906 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2002-04-10 Andrew Cagney <ac131313@redhat.com>
+ * stack.c (select_frame): Cleanup internal error message, do not
+ use %p.
+
+2002-04-10 Andrew Cagney <ac131313@redhat.com>
+
* stack.c (select_frame): Check that selected_frame and the
specified level are as expected.
* blockframe.c (get_prev_frame): Set the `level' from next_frame.
diff --git a/gdb/stack.c b/gdb/stack.c
index a348934..6a26e9a 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1488,8 +1488,9 @@ select_frame (struct frame_info *fi, int level)
;
else
internal_error (__FILE__, __LINE__,
- "oops! fi=0x%p, fi->level=%d, level=%d",
- fi, fi ? fi->level : -1, level);
+ "Conflicting frame levels fi->level=%d, level=%d",
+ (fi ? fi->level : -1),
+ level);
if (selected_frame_level_changed_hook)
selected_frame_level_changed_hook (level);