* dll_init.cc (dll_list::append): Eliminate increment of unused tot variable.

* dll_init.h (dll_list::tot): Delete.
(dll_list::populate_all_deps): Delete undefined function.
* fhandler.cc (fhandler_base_overlapped::wait_overlapped): Move EPIPE handling
under error condition.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3406ed3dac61b5d641034bb7855768438c3e899f..b9c7453f38b51180b78f24be2ed54b742ec40449 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-30  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+       * dll_init.cc (dll_list::append): Eliminate increment of unused tot
+       variable.
+       * dll_init.h (dll_list::tot): Delete.
+       (dll_list::populate_all_deps): Delete undefined function.
+
+       * fhandler.cc (fhandler_base_overlapped::wait_overlapped): Move EPIPE
+       handling under error condition.
+
 2011-05-30  Ryan Johnson  <ryan.johnson@cs.utoronto.ca>
 
        * dll_init.cc (reserve_upto): Remove.

diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
index 9994ef8f168dbaeab8b5e72e0c490acfa64d95ac..0258b3549f48fa02ba82c47052c3de87692fb427 100644 (file)
--- a/winsup/cygwin/dll_init.cc
+++ b/winsup/cygwin/dll_init.cc
@@ -199,7 +199,6 @@ dll_list::append (dll* d)
   d->next = NULL;
   d->prev = end;
   end = d;
-  tot++;
 }
 
 void dll_list::populate_deps (dll* d)

diff --git a/winsup/cygwin/dll_init.h b/winsup/cygwin/dll_init.h
index bf0265303dfed57e4059d89da318fe7a4a779452..3f50dcab0a597e58c15f9ea039ef61ed034ddd3a 100644 (file)
--- a/winsup/cygwin/dll_init.h
+++ b/winsup/cygwin/dll_init.h
@@ -80,7 +80,6 @@ class dll_list
   static muto protect;
 public:
   dll start;
-  int tot;
   int loaded_dlls;
   int reload_on_fork;
   dll *operator [] (const PWCHAR name);
@@ -92,7 +91,6 @@ public:
   void reserve_space ();
   void load_after_fork_impl (HANDLE, dll* which, int retries);
   dll *find_by_modname (const PWCHAR name);
-  void populate_all_deps ();
   void populate_deps (dll* d);
   void topsort ();
   void topsort_visit (dll* d, bool goto_tail);

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index deb1ade1668d86b6cb02681ac7122f3a90255720..b64b090474886f0b962d613ef51b5a28152922d1 100644 (file)
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1887,13 +1887,15 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
       HANDLE h = writing ? get_output_handle () : get_handle ();
       CancelIo (h);
       ResetEvent (get_overlapped ());
-      if (res == overlapped_error)
-       __seterrno_from_win_error (err);
       *bytes = (DWORD) -1;
+      if (res == overlapped_error)
+       {
+         __seterrno_from_win_error (err);
+         if (writing && (err == ERROR_NO_DATA || err == ERROR_BROKEN_PIPE))
+           raise (SIGPIPE);
+       }
     }
 
-  if (writing && (err == ERROR_NO_DATA || err == ERROR_BROKEN_PIPE))
-    raise (SIGPIPE);
   return res;
 }