* stack.c (select_and_print_frame): Make static. Delete the

parameter `level'.
(func_command): Update call.
(select_frame_command): Delete code computing the frame level.
* frame.h (select_and_print_frame): Delete declaration.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 214793733a4939b074f591f1e6ea5fbfb02f80b5..847942f9853fcea9f6cfd31865e1fa093cfc0d10 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-04  Andrew Cagney  <ac131313@redhat.com>
+
+       * stack.c (select_and_print_frame): Make static.  Delete the
+       parameter `level'.
+       (func_command): Update call.
+       (select_frame_command): Delete code computing the frame level.
+       * frame.h (select_and_print_frame): Delete declaration.
+
 2002-05-04  Andrew Cagney  <ac131313@redhat.com>
 
        * sparc-tdep.c (sparc_get_saved_register): Comment why

diff --git a/gdb/frame.h b/gdb/frame.h
index 9a041c49f491508d4403c1bef8078ffbf53ca6b2..f0631b0155595e01420d0a9b93a67cafabd2d533 100644 (file)
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -248,8 +248,6 @@ extern void select_frame (struct frame_info *);
 
 extern void record_selected_frame (CORE_ADDR *, int *);
 
-extern void select_and_print_frame (struct frame_info *, int);
-
 extern void print_frame_info (struct frame_info *, int, int, int);
 
 extern void show_frame_info (struct frame_info *, int, int, int);

diff --git a/gdb/stack.c b/gdb/stack.c
index 75eb6a1f2744d166d2662f6256ae181d1ec6cabe..2dab0deb0161d9dfdb56e2bb15b43bd0ae0ce69b 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1490,13 +1490,13 @@ select_frame (struct frame_info *fi)
 
 /* Select frame FI.  Also print the stack frame and show the source if
    this is the tui version.  */
-void
-select_and_print_frame (struct frame_info *fi, int level)
+static void
+select_and_print_frame (struct frame_info *fi)
 {
   select_frame (fi);
   if (fi)
     {
-      print_stack_frame (fi, level, 1);
+      print_stack_frame (fi, frame_relative_level (fi), 1);
     }
 }
 \f
@@ -1594,20 +1594,6 @@ select_frame_command (char *level_exp, int from_tty)
 
   frame = parse_frame_specification (level_exp);
 
-  /* Try to figure out what level this frame is.  But if there is
-     no current stack, don't error out -- let the user set one.  */
-  frame1 = 0;
-  if (get_current_frame ())
-    {
-      for (frame1 = get_prev_frame (0);
-          frame1 && frame1 != frame;
-          frame1 = get_prev_frame (frame1))
-       level++;
-    }
-
-  if (!frame1)
-    level = 0;
-
   select_frame (frame);
 }
 
@@ -1865,7 +1851,7 @@ func_command (char *arg, int from_tty)
   if (!found)
     printf_filtered ("'%s' not within current stack frame.\n", arg);
   else if (fp != selected_frame)
-    select_and_print_frame (fp, level);
+    select_and_print_frame (fp);
 }
 
 /* Gets the language of the current frame.  */