diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-03-27 15:04:42 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-03-27 15:04:42 +0000 |
| commit | 52e26dc2ab6a0c3138c76586385a5dece5dcf8a4 (patch) | |
| tree | 9064479f315ee22e348201dbb3988618c4f7b2f8 /winsup | |
| parent | c465a371ea7822e10cb2f4061cb8dc4aab40b023 (diff) | |
| download | cygnal-52e26dc2ab6a0c3138c76586385a5dece5dcf8a4.tar.gz cygnal-52e26dc2ab6a0c3138c76586385a5dece5dcf8a4.tar.bz2 cygnal-52e26dc2ab6a0c3138c76586385a5dece5dcf8a4.zip | |
* fhandler.h (class fhandler_fifo): Rename read/write methods to
raw_read/raw_write.
* fhandler_fifo.cc: Ditto.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.h | 4 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_fifo.cc | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6a8612b30..f7c56e6f0 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2009-03-27 Corinna Vinschen <corinna@vinschen.de> + * fhandler.h (class fhandler_fifo): Rename read/write methods to + raw_read/raw_write. + * fhandler_fifo.cc: Ditto. + +2009-03-27 Corinna Vinschen <corinna@vinschen.de> + * syscalls.cc (pathconf): Fix memory leak. 2009-03-26 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index d526f529d..58ca21476 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -576,8 +576,8 @@ class fhandler_fifo: public fhandler_base bool wait (bool) __attribute__ ((regparm (1))); public: fhandler_fifo (); - void __stdcall read (void *, size_t&) __attribute__ ((regparm (3))); - int write (const void *, size_t); + void raw_read (void *, size_t&); + int raw_write (const void *, size_t); int open (int, mode_t); bool isfifo () { return true; } int __stdcall fstatvfs (struct statvfs *buf) __attribute__ ((regparm (2))); diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index 137e4a7ac..517eceb31 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -166,7 +166,7 @@ fhandler_fifo::wait (bool iswrite) } void -fhandler_fifo::read (void *in_ptr, size_t& len) +fhandler_fifo::raw_read (void *in_ptr, size_t& len) { if (!wait (false)) len = 0; @@ -175,7 +175,7 @@ fhandler_fifo::read (void *in_ptr, size_t& len) } int -fhandler_fifo::write (const void *ptr, size_t len) +fhandler_fifo::raw_write (const void *ptr, size_t len) { return wait (true) ? write_overlapped (ptr, len) : -1; } |