* 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.
This commit is contained in:
Christopher Faylor 2011-05-30 17:16:24 +00:00
parent 6642f7daa3
commit de3c57f06e
4 changed files with 16 additions and 7 deletions

View File

@ -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.

View File

@ -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)

View File

@ -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);

View File

@ -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;
}