From 8bce0d723c50924b908dca1467037c8008e872be Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 14 Dec 2002 04:01:32 +0000 Subject: Throughout, change fhandler_*::read and fhandler_*::raw_read to void functions whose second arguments are both the lenght and the return value. * fhandler.cc (fhandler_base::read): Rework slightly to use second argument as input/output. Tweak CRLF stuff. (fhandler_base::readv): Accommodate fhandler_*::read changes. * cygthread.h (cygthread::detach): Declare as taking optional handle argument. (cygthread::detach): When given a handle argument, wait for the handle to be signalled before waiting for thread to detach. Return true when signal detected. --- winsup/cygwin/fhandler_mem.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'winsup/cygwin/fhandler_mem.cc') diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc index 177e645c0..089b56b4b 100644 --- a/winsup/cygwin/fhandler_mem.cc +++ b/winsup/cygwin/fhandler_mem.cc @@ -176,16 +176,20 @@ fhandler_dev_mem::write (const void *ptr, size_t ulen) return ulen; } -int __stdcall -fhandler_dev_mem::read (void *ptr, size_t ulen) +void __stdcall +fhandler_dev_mem::read (void *ptr, size_t& ulen) { if (!ulen || pos >= mem_size) - return 0; + { + ulen = 0; + return; + } if (!(get_access () & GENERIC_READ)) { set_errno (EINVAL); - return -1; + (ssize_t) ulen = -1; + return; } if (pos + ulen > mem_size) @@ -209,7 +213,8 @@ fhandler_dev_mem::read (void *ptr, size_t ulen) PAGE_READONLY)) != STATUS_SUCCESS) { __seterrno_from_win_error (RtlNtStatusToDosError (ret)); - return -1; + (ssize_t) ulen = -1; + return; } memcpy (ptr, (char *) viewmem + (pos - phys.QuadPart), ulen); @@ -217,11 +222,12 @@ fhandler_dev_mem::read (void *ptr, size_t ulen) if (!NT_SUCCESS (ret = NtUnmapViewOfSection (INVALID_HANDLE_VALUE, viewmem))) { __seterrno_from_win_error (RtlNtStatusToDosError (ret)); - return -1; + (ssize_t) ulen = -1; + return; } pos += ulen; - return ulen; + return; } int -- cgit v1.2.3