JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.cc (fhandler_base::read): Call get_readahead_into_buffer instead of

Browse Source 
duplicating it.
This commit is contained in:
Christopher Faylor
2006-07-27 03:32:51 +00:00
parent a0bb355ffe
commit 5ecd1ea663
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
2006-07-26 Brian ford <Brian.Ford@FlightSafety.com>
* fhandler.cc (fhandler_base::read): Call get_readahead_into_buffer
instead of duplicating it.
2006-07-26 Corinna Vinschen <corinna@vinschen.de> 2006-07-26 Corinna Vinschen <corinna@vinschen.de>
* shared.cc (offsets): Define as offsets relative to cygwin_hmodule * shared.cc (offsets): Define as offsets relative to cygwin_hmodule

13
winsup/cygwin/fhandler.cc
View File

@@ -716,17 +716,7 @@ void
fhandler_base::read (void *in_ptr, size_t& len) fhandler_base::read (void *in_ptr, size_t& len)
{ {
char *ptr = (char *) in_ptr; char *ptr = (char *) in_ptr;
ssize_t copied_chars = 0; ssize_t copied_chars = get_readahead_into_buffer (ptr, len);
int c;
while (len)
if ((c = get_readahead ()) < 0)
break;
else
{
ptr[copied_chars++] = (unsigned char) (c & 0xff);
len--;
}
if (copied_chars && is_slow ()) if (copied_chars && is_slow ())
{ {
@@ -734,6 +724,7 @@ fhandler_base::read (void *in_ptr, size_t& len)
goto out; goto out;
} }
len -= copied_chars;
if (!len) if (!len)
{ {
len = (size_t) copied_chars; len = (size_t) copied_chars;