drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: fhandler_*: remove isdevice() and is_auto_device() 

isdevice() is used only in the definition of is_auto_device().  And
the latter is used only once, in a context where isdevice() always
returns true.
This commit is contained in:
Ken Brown 2019-07-19 15:39:35 -04:00
parent 6b7723a830
commit 4beb9da118
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
winsup/cygwin/fhandler.h
View File

@ -414,7 +414,6 @@ public:
virtual bool is_tty () const { return false; } virtual bool is_tty () const { return false; }
virtual bool ispipe () const { return false; } virtual bool ispipe () const { return false; }
virtual pid_t get_popen_pid () const {return 0;} virtual pid_t get_popen_pid () const {return 0;}
virtual bool isdevice () const { return true; }
virtual bool isfifo () const { return false; } virtual bool isfifo () const { return false; }
virtual int ptsname_r (char *, size_t); virtual int ptsname_r (char *, size_t);
virtual class fhandler_socket *is_socket () { return NULL; } virtual class fhandler_socket *is_socket () { return NULL; }
@ -459,7 +458,6 @@ public:
virtual void seekdir (DIR *, long); virtual void seekdir (DIR *, long);
virtual void rewinddir (DIR *); virtual void rewinddir (DIR *);
virtual int closedir (DIR *); virtual int closedir (DIR *);
bool is_auto_device () {return isdevice () && !dev ().isfs ();}
bool is_fs_special () {return pc.is_fs_special ();} bool is_fs_special () {return pc.is_fs_special ();}
bool issymlink () {return pc.issymlink ();} bool issymlink () {return pc.issymlink ();}
bool __reg2 device_access_denied (int); bool __reg2 device_access_denied (int);
@ -1527,7 +1525,6 @@ class fhandler_disk_file: public fhandler_base
int dup (fhandler_base *child, int); int dup (fhandler_base *child, int);
void fixup_after_fork (HANDLE parent); void fixup_after_fork (HANDLE parent);
int mand_lock (int, struct flock *); int mand_lock (int, struct flock *);
bool isdevice () const { return false; }
int __reg2 fstat (struct stat *buf); int __reg2 fstat (struct stat *buf);
int __reg1 fchmod (mode_t mode); int __reg1 fchmod (mode_t mode);
int __reg2 fchown (uid_t uid, gid_t gid); int __reg2 fchown (uid_t uid, gid_t gid);

2
winsup/cygwin/fhandler_raw.cc
View File

@ -38,7 +38,7 @@ fhandler_dev_raw::fstat (struct stat *buf)
debug_printf ("here"); debug_printf ("here");
fhandler_base::fstat (buf); fhandler_base::fstat (buf);
if (is_auto_device ()) if (!dev ().isfs ())
{ {
if (get_major () == DEV_TAPE_MAJOR) if (get_major () == DEV_TAPE_MAJOR)
buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH; buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;