* stack.c (select_frame): Cleanup internal error message, do not

use %p.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 39a50f3..e3f3906 100644 (file)
--- 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 (file)
--- 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);