* cygtls.cc (_cygtls::remove): Remove left over debugging cruft which caused

this function to always return prematurely.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9dee41b2f74812b002116d36214f98011244b5a0..52a0fff06cb224c27ef08f9289a942caea7ed1e2 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-01  Christopher Faylor  <cgf@timesys.com>
+
+       * cygtls.cc (_cygtls::remove): Remove left over debugging cruft which
+       caused this function to always return prematurely.
+
 2006-01-01  Christopher Faylor  <cgf@timesys.com>
 
        * exceptions.cc (sigpacket::process): Pass actual reference to signal's

diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index e27fe1e83a673c33103c68e934d4fe93a14a24c9..23415669abb3cf9e5669d5be0e9e4f61f0343ad6 100644 (file)
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -147,7 +147,7 @@ void
 _cygtls::remove (DWORD wait)
 {
   debug_printf ("wait %p", wait);
-  if (1 || !isinitialized () || !locals.exitsock || exit_state >= ES_FINAL)
+  if (!isinitialized () || !locals.exitsock || exit_state >= ES_FINAL)
     return;
   if (wait)
     {

diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index 9e59296324562a6e799814758c232c731b7c2eb7..779183c53d6c6af24b105955c138d77a261dadf1 100644 (file)
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -223,9 +223,7 @@ strace::write_childpid (child_info& ch, DWORD pid)
 
   if (!attached () || !being_debugged ())
     return;
-int res =
   WaitForSingleObject (ch.subproc_ready, 30000);
-do { if ((0x00040 & 0x08000) || active ()) prntf (0x00040, __PRETTY_FUNCTION__, "res %d", res); } while (0);
   __small_sprintf (buf, "cYg%8x %x", _STRACE_CHILD_PID, pid);
   OutputDebugString (buf);
 }