diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-10-24 17:51:41 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-10-24 17:51:41 +0000 |
| commit | 8ef76ab6f9320b859ef7c6934bdc96762205b264 (patch) | |
| tree | 211187de7db368d626c6475cff84f87e69f15ec4 /winsup/cygwin/fhandler.h | |
| parent | 4ae84b225105921c1ceef22ff541b06ba7558c11 (diff) | |
| download | cygnal-8ef76ab6f9320b859ef7c6934bdc96762205b264.tar.gz cygnal-8ef76ab6f9320b859ef7c6934bdc96762205b264.tar.bz2 cygnal-8ef76ab6f9320b859ef7c6934bdc96762205b264.zip | |
* fhandler.h (fhandler_dev_zero::lseek): Convert to inline method.
(class fhandler_dev_random): Drop dummy_offset.
(fhandler_dev_random::lseek): Convert to inline method.
(fhandler_dev_dsp::lseek): Ditto.
* fhandler_dsp.cc (fhandler_dev_dsp::lseek): Drop here.
* fhandler_random.cc (fhandler_dev_random::open): Drop setting
dummy_offset.
(fhandler_dev_random::lseek): Drop here.
* fhandler_tape.cc (fhandler_dev_tape::lseek): Make no-op, but keep
old code for reference.
* fhandler_zero.cc (fhandler_dev_zero::lseek): Drop here.
Diffstat (limited to 'winsup/cygwin/fhandler.h')
| -rw-r--r-- | winsup/cygwin/fhandler.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 0895bf88c..840a96125 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1621,7 +1621,7 @@ class fhandler_dev_zero: public fhandler_base fhandler_dev_zero (); ssize_t __stdcall write (const void *ptr, size_t len); void __reg3 read (void *ptr, size_t& len); - off_t lseek (off_t offset, int whence); + off_t lseek (off_t, int) { return 0; } virtual HANDLE mmap (caddr_t *addr, size_t len, int prot, int flags, off_t off); @@ -1653,7 +1653,6 @@ class fhandler_dev_random: public fhandler_base { protected: uint32_t pseudo; - off_t dummy_offset; bool crypt_gen_random (void *ptr, size_t len); int pseudo_write (const void *ptr, size_t len); @@ -1663,7 +1662,7 @@ class fhandler_dev_random: public fhandler_base int open (int flags, mode_t mode = 0); ssize_t __stdcall write (const void *ptr, size_t len); void __reg3 read (void *ptr, size_t& len); - off_t lseek (off_t offset, int whence); + off_t lseek (off_t, int) { return 0; } int close (); fhandler_dev_random () : fhandler_base () {} @@ -1780,7 +1779,7 @@ class fhandler_dev_dsp: public fhandler_base ssize_t __stdcall write (const void *ptr, size_t len); void __reg3 read (void *ptr, size_t& len); int ioctl (unsigned int cmd, void *); - off_t lseek (off_t, int); + off_t lseek (off_t, int) { return 0; } int close (); void fixup_after_fork (HANDLE parent); void fixup_after_exec (); |