* cygheap.cc (cygheap_dummy): Rename from cygheap_at_start.

(cygheap): Accommodate name change to cygheap_dummy.
(cygheap_init): Ditto.
(cygheap_fixup_in_child): Simplify slightly.
* fork.cc (fork): Add an advisory comment.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ccc8412eb44ddb2b7e24cfe33666fb4e697caee7..5d377ebbcdf5997dad4d35fb073afb3dcdd4677c 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-30  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+       * cygheap.cc (cygheap_dummy): Rename from cygheap_at_start.
+       (cygheap): Accommodate name change to cygheap_dummy.
+       (cygheap_init): Ditto.
+       (cygheap_fixup_in_child): Simplify slightly.
+       * fork.cc (fork): Add an advisory comment.
+
 2011-05-29  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
        * fhandler.cc (fhandler_overlapped::wait_overlapped): Make sure that

diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 8a2a1f4dc374ed28f1c9ec212a39afbf54b69e23..35d133a2b765052b4476b1e60b823577aa537e88 100644 (file)
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -26,12 +26,12 @@
 #include <unistd.h>
 #include <wchar.h>
 
-static mini_cygheap NO_COPY cygheap_at_start =
+static mini_cygheap NO_COPY cygheap_dummy =
 {
   {__utf8_mbtowc, __utf8_wctomb}
 };
 
-init_cygheap NO_COPY *cygheap = (init_cygheap *) &cygheap_at_start;
+init_cygheap NO_COPY *cygheap = (init_cygheap *) &cygheap_dummy;
 void NO_COPY *cygheap_max;
 
 extern "C" char  _cygheap_end[];
@@ -61,8 +61,7 @@ static void *__stdcall _csbrk (int);
 void __stdcall
 cygheap_fixup_in_child (bool execed)
 {
-  cygheap_max = child_proc_info->cygheap;
-  cygheap = (init_cygheap *) cygheap_max;
+  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);
   cygheap_init ();
@@ -156,7 +155,7 @@ void __stdcall
 cygheap_init ()
 {
   cygheap_protect.init ("cygheap_protect");
-  if (cygheap == &cygheap_at_start)
+  if (cygheap == &cygheap_dummy)
     {
       cygheap = (init_cygheap *) memset (_cygheap_start, 0,
                                         sizeof (*cygheap));

diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 3ec7fa8c53f5548bcd9e7fcbbe95dca00d0f3b39..9e34da60c895162b54a886fdbbffe6b59536bb0e 100644 (file)
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -601,6 +601,7 @@ extern "C" int
 fork ()
 {
   frok grouped;
+  /* No cygheap allocation beyond this point. */
 
   debug_printf ("entering");
   grouped.load_dlls = 0;