libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-21 16:26:12 +08:00
Code Issues Projects Releases Wiki Activity

* cygheap.cc (_csbrk): More left coercion cleanup.

Browse Source 
* fhandler_tty.cc (fhandler_tty_slave::read): Ditto.
(fhandler_tty_slave::write): Ditto.
* fhandler_windows.cc (fhandler_windows::read): Ditto.
* heap.cc (sbrk): Ditto.
This commit is contained in:
Christopher Faylor 2003-09-07 18:27:54 +00:00
parent ed2287adcd
commit bd8938985e
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2003-09-07 Christopher Faylor <cgf@redhat.com>
* cygheap.cc (_csbrk): More left coercion cleanup.
* fhandler_tty.cc (fhandler_tty_slave::read): Ditto.
(fhandler_tty_slave::write): Ditto.
* fhandler_windows.cc (fhandler_windows::read): Ditto.
* heap.cc (sbrk): Ditto.
2003-09-07 Pierre Humblet <pierre.humblet@ieee.org> 2003-09-07 Pierre Humblet <pierre.humblet@ieee.org>
* signal.cc (nanosleep): Improve test for valid values. Round delay up * signal.cc (nanosleep): Improve test for valid values. Round delay up

4
winsup/cygwin/cygheap.cc
View File

@ -179,14 +179,14 @@ _csbrk (int sbs)
{ {
void *prebrk = cygheap_max; void *prebrk = cygheap_max;
void *prebrka = pagetrunc (prebrk); void *prebrka = pagetrunc (prebrk);
(char *) cygheap_max += sbs; cygheap_max = (char *) cygheap_max + sbs;
if (!sbs || (prebrk != prebrka && prebrka == pagetrunc (cygheap_max))) if (!sbs || (prebrk != prebrka && prebrka == pagetrunc (cygheap_max)))
/* nothing to do */; /* nothing to do */;
else if (!VirtualAlloc (prebrk, (DWORD) sbs, MEM_COMMIT, PAGE_READWRITE)) else if (!VirtualAlloc (prebrk, (DWORD) sbs, MEM_COMMIT, PAGE_READWRITE))
{ {
malloc_printf ("couldn't commit memory for cygwin heap, %E"); malloc_printf ("couldn't commit memory for cygwin heap, %E");
__seterrno (); __seterrno ();
(char *) cygheap_max -= sbs; cygheap_max = (char *) cygheap_max - sbs;
return NULL; return NULL;
} }

6
winsup/cygwin/fhandler_tty.cc
View File

@ -762,7 +762,7 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
if (!vmin && !time_to_wait) if (!vmin && !time_to_wait)
{ {
ReleaseMutex (input_mutex); ReleaseMutex (input_mutex);
(ssize_t) len = bytes_in_pipe; len = (size_t) bytes_in_pipe;
return; return;
} }
@ -842,7 +842,7 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
waiter = time_to_wait; waiter = time_to_wait;
} }
termios_printf ("%d=read(%x, %d)", totalread, ptr, len); termios_printf ("%d=read(%x, %d)", totalread, ptr, len);
(ssize_t) len = totalread; len = (size_t) totalread;
return; return;
} }
@ -1153,7 +1153,7 @@ fhandler_pty_master::write (const void *ptr, size_t len)
void __stdcall void __stdcall
fhandler_pty_master::read (void *ptr, size_t& len) fhandler_pty_master::read (void *ptr, size_t& len)
{ {
(ssize_t) len = process_slave_output ((char *) ptr, len, pktmode); len = (size_t) process_slave_output ((char *) ptr, len, pktmode);
return; return;
} }

2
winsup/cygwin/fhandler_windows.cc
View File

@ -90,7 +90,7 @@ fhandler_windows::read (void *buf, size_t& len)
return; return;
} }
(ssize_t) len = GetMessage (ptr, hWnd_, 0, 0); len = (size_t) GetMessage (ptr, hWnd_, 0, 0);
if ((ssize_t) len == -1) if ((ssize_t) len == -1)
__seterrno (); __seterrno ();

2
winsup/cygwin/heap.cc
View File

@ -146,7 +146,7 @@ sbrk (int n)
|| VirtualAlloc (cygheap->user_heap.top, newbrksize = commitbytes, MEM_RESERVE, PAGE_NOACCESS)) || VirtualAlloc (cygheap->user_heap.top, newbrksize = commitbytes, MEM_RESERVE, PAGE_NOACCESS))
&& VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL) && VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
{ {
(char *) cygheap->user_heap.max += pround (newbrksize); cygheap->user_heap.max = (char *) cygheap->user_heap.max + pround (newbrksize);
goto good; goto good;
} }