* 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:
parent
6642f7daa3
commit
de3c57f06e
@ -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>
|
2011-05-30 Ryan Johnson <ryan.johnson@cs.utoronto.ca>
|
||||||
|
|
||||||
* dll_init.cc (reserve_upto): Remove.
|
* dll_init.cc (reserve_upto): Remove.
|
||||||
|
@ -199,7 +199,6 @@ dll_list::append (dll* d)
|
|||||||
d->next = NULL;
|
d->next = NULL;
|
||||||
d->prev = end;
|
d->prev = end;
|
||||||
end = d;
|
end = d;
|
||||||
tot++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void dll_list::populate_deps (dll* d)
|
void dll_list::populate_deps (dll* d)
|
||||||
|
@ -80,7 +80,6 @@ class dll_list
|
|||||||
static muto protect;
|
static muto protect;
|
||||||
public:
|
public:
|
||||||
dll start;
|
dll start;
|
||||||
int tot;
|
|
||||||
int loaded_dlls;
|
int loaded_dlls;
|
||||||
int reload_on_fork;
|
int reload_on_fork;
|
||||||
dll *operator [] (const PWCHAR name);
|
dll *operator [] (const PWCHAR name);
|
||||||
@ -92,7 +91,6 @@ public:
|
|||||||
void reserve_space ();
|
void reserve_space ();
|
||||||
void load_after_fork_impl (HANDLE, dll* which, int retries);
|
void load_after_fork_impl (HANDLE, dll* which, int retries);
|
||||||
dll *find_by_modname (const PWCHAR name);
|
dll *find_by_modname (const PWCHAR name);
|
||||||
void populate_all_deps ();
|
|
||||||
void populate_deps (dll* d);
|
void populate_deps (dll* d);
|
||||||
void topsort ();
|
void topsort ();
|
||||||
void topsort_visit (dll* d, bool goto_tail);
|
void topsort_visit (dll* d, bool goto_tail);
|
||||||
|
@ -1887,13 +1887,15 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
|
|||||||
HANDLE h = writing ? get_output_handle () : get_handle ();
|
HANDLE h = writing ? get_output_handle () : get_handle ();
|
||||||
CancelIo (h);
|
CancelIo (h);
|
||||||
ResetEvent (get_overlapped ());
|
ResetEvent (get_overlapped ());
|
||||||
if (res == overlapped_error)
|
|
||||||
__seterrno_from_win_error (err);
|
|
||||||
*bytes = (DWORD) -1;
|
*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;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user