Remove erroneously checked-in debugging statements.

* cygheap.cc (cygheap_fixup_in_child): Here.
* debug.cc (delete_handle): Here.
* sigproc.cc (child_info_spawn::cleanup): Here.
* spawn.cc (child_info_spawn::worker): Here.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 79e9555..afc5ed2 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,13 @@
 2011-11-13  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
+       Remove erroneously checked-in debugging statements.
+       * cygheap.cc (cygheap_fixup_in_child): Here.
+       * debug.cc (delete_handle): Here.
+       * sigproc.cc (child_info_spawn::cleanup): Here.
+       * spawn.cc (child_info_spawn::worker): Here.
+
+2011-11-13  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
        Throughout, change "sig %d" in strace output to "signal %d" for
        consistency.
        * assert.cc (__assert_func): Output assertion string to strace too.

diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 832d367..5543759 100644 (file)
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -64,11 +64,8 @@ cygheap_fixup_in_child (bool execed)
   cygheap_max = cygheap = (init_cygheap *) _cygheap_start;
   _csbrk ((char *) child_proc_info->cygheap_max - (char *) cygheap);
   child_copy (child_proc_info->parent, false, "cygheap", cygheap, cygheap_max, NULL);
-debug_printf ("HERE");
   cygheap_init ();
-debug_printf ("HERE 2");
   debug_fixup_after_fork_exec ();
-debug_printf ("HERE 2, %d", execed);
   if (execed)
     {
       cygheap->hooks.next = NULL;
@@ -86,7 +83,6 @@ debug_printf ("HERE 2, %d", execed);
            _cfree (ce);                /* Marked by parent for freeing in child */
        }
     }
-debug_printf ("HERE 3, %d", execed);
 }
 
 int

diff --git a/winsup/cygwin/debug.cc b/winsup/cygwin/debug.cc
index 9acb54b..6613dd9 100644 (file)
--- a/winsup/cygwin/debug.cc
+++ b/winsup/cygwin/debug.cc
@@ -171,7 +171,6 @@ delete_handle (handle_list *hl)
 void
 debug_fixup_after_fork_exec ()
 {
-debug_printf ("BEFORE");
   /* No lock needed at this point */
   handle_list *hl;
   for (hl = &cygheap->debug.starth; hl->next != NULL; /* nothing */)
@@ -179,7 +178,6 @@ debug_printf ("BEFORE");
       hl = hl->next;
     else
       delete_handle (hl);      // removes hl->next
-debug_printf ("AFTER");
 }
 
 static bool __stdcall

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index c3915fd..b596456 100644 (file)
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -865,13 +865,10 @@ child_info_spawn::cleanup ()
       CloseHandle (ev);
       ev = NULL;
     }
-debug_printf ("type %d, type == _CH_EXEC == %d, hExeced %p", type, type == _CH_EXEC, hExeced);
   if (type == _CH_EXEC)
     {
       if (iscygwin () && hExeced)
-{debug_printf ("cleaning up");
        proc_subproc (PROC_EXEC_CLEANUP, 0);
-}
       sync_proc_subproc.release ();
     }
   type = _CH_NADA;

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 8453805..b250db1 100644 (file)
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -849,7 +849,6 @@ loop:
     }
 
 out:
-debug_printf ("about to call cleanup");
   this->cleanup ();
   if (envblock)
     free (envblock);