* infrun.c (handle_inferior_event): Rename 'tmp' to real_stop_pc.

Remove duplicate/shadowing variable of same name.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 436d69ba5e595a9a98331b01daa87c57234d42ed..ec0621b14bf110a8bff180a981b70ab5e87ad73f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-31  Adam Fedor  <fedor@gnu.org>
+
+       * infrun.c (handle_inferior_event): Rename 'tmp' to real_stop_pc.
+       Remove duplicate/shadowing variable of same name.
+
 2003-01-30  Jim Blandy  <jimb@redhat.com>
 
        * symfile.c (find_separate_debug_file): Assert that the objfile's

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 29ebf4413b5e4a2fcac91c80210b1f37570b61a5..f8644420e14c49b4262f6ff78ec5e06647a5a7f1 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1172,7 +1172,7 @@ context_switch (struct execution_control_state *ecs)
 void
 handle_inferior_event (struct execution_control_state *ecs)
 {
-  CORE_ADDR tmp;
+  CORE_ADDR real_stop_pc;
   int stepped_after_stopped_by_watchpoint;
   int sw_single_step_trap_p = 0;
 
@@ -2407,19 +2407,19 @@ process_event_stop_test:
          function.  That's what tells us (a) whether we want to step
          into it at all, and (b) what prologue we want to run to
          the end of, if we do step into it.  */
-      tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
-      if (tmp != 0)
-       ecs->stop_func_start = tmp;
+      real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
+      if (real_stop_pc != 0)
+       ecs->stop_func_start = real_stop_pc;
       else
        {
-         tmp = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc);
-         if (tmp)
+         real_stop_pc = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc);
+         if (real_stop_pc)
            {
              struct symtab_and_line xxx;
              /* Why isn't this s_a_l called "sr_sal", like all of the
                 other s_a_l's where this code is duplicated?  */
              init_sal (&xxx);  /* initialize to zeroes */
-             xxx.pc = tmp;
+             xxx.pc = real_stop_pc;
              xxx.section = find_pc_overlay (xxx.pc);
              check_for_old_step_resume_breakpoint ();
              step_resume_breakpoint =
@@ -2482,19 +2482,17 @@ process_event_stop_test:
      we want to proceed through the trampoline when stepping.  */
   if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
     {
-      CORE_ADDR tmp;
-
       /* Determine where this trampoline returns.  */
-      tmp = SKIP_TRAMPOLINE_CODE (stop_pc);
+      real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
 
       /* Only proceed through if we know where it's going.  */
-      if (tmp)
+      if (real_stop_pc)
        {
          /* And put the step-breakpoint there and go until there. */
          struct symtab_and_line sr_sal;
 
          init_sal (&sr_sal);   /* initialize to zeroes */
-         sr_sal.pc = tmp;
+         sr_sal.pc = real_stop_pc;
          sr_sal.section = find_pc_overlay (sr_sal.pc);
          /* Do not specify what the fp should be when we stop
             since on some machines the prologue