gdb/

	Code cleanup.
	* linux-nat.c (linux_nat_wait_1): Reset STATUS after calling
	linux_nat_wait_1.  Use always LP->STATUS afterwards.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8776c0c..f469860 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Code cleanup.
+       * linux-nat.c (linux_nat_wait_1): Reset STATUS after calling
+       linux_nat_wait_1.  Use always LP->STATUS afterwards.
+
 2010-07-20  Hui Zhu  <teawater@gmail.com>
 
        * inf-ptrace.c (inf_ptrace_create_inferior): Initialize back_to.

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index a659afa..b894d84 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -3367,6 +3367,9 @@ retry:
 
          lp = linux_nat_filter_event (lwpid, status, options);
 
+         /* STATUS is now no longer valid, use LP->STATUS instead.  */
+         status = 0;
+
          if (lp
              && ptid_is_pid (ptid)
              && ptid_get_pid (lp->ptid) != ptid_get_pid (ptid))
@@ -3375,7 +3378,7 @@ retry:
 
              if (debug_linux_nat)
                fprintf (stderr, "LWP %ld got an event %06x, leaving pending.\n",
-                        ptid_get_lwp (lp->ptid), status);
+                        ptid_get_lwp (lp->ptid), lp->status);
 
              if (WIFSTOPPED (lp->status))
                {
@@ -3412,7 +3415,7 @@ retry:
                      lp->signalled = 0;
                    }
                }
-             else if (WIFEXITED (status) || WIFSIGNALED (status))
+             else if (WIFEXITED (lp->status) || WIFSIGNALED (lp->status))
                {
                  if (debug_linux_nat)
                    fprintf (stderr, "Process %ld exited while stopping LWPs\n",