This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH 1/4] Cygwin: fhandler_*: remove isdevice() and is_auto_device()
- From: Ken Brown <kbrown at cornell dot edu>
- To: "cygwin-patches at cygwin dot com" <cygwin-patches at cygwin dot com>
- Date: Sun, 21 Jul 2019 01:53:01 +0000
- Subject: [PATCH 1/4] Cygwin: fhandler_*: remove isdevice() and is_auto_device()
- Arc-authentication-results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=cornell.edu;dmarc=pass action=none header.from=cornell.edu;dkim=pass header.d=cornell.edu;arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8+2cDh5Ty3iRQyOasHdc+L5RbnzoJdOGGKSxKV7e9YA=; b=muVJJ9w4DMlrIkvVcEAtfJezYDfs6XBwUtpsmesKyknkhX5Q5C0POauEfw6rGupxMgW/vuJAeZDlDcFoQhcTfP3uAtUfHgfDRhwrehyPXjE1JoxTn8muA3XGgTlO5v4r6rjiCNUlJH1fB1d0a47rhEjzg4r6r4fyWCmEvjGVXdCAqpUyokPDu/OZgBHxGzlNBZD1mEsWsM7tH3E14or7ydmtbuYGu7JolUPhXD+8ST4hRC13cn/c8BU0cNBteNCnQA/mo6FjUGSMetFejtkBYw6z1Q+dI1gSnh/kcC/WeQV5MVkRsnWAS+EO3NQWQTV8KMISPP/9+YX9LpKPyFkQcg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gOA8khrjceF0QX0vUTHbxuRGvyw6jWn9qK26jb2iN/QGaF5sOjBI0AsBCglZkVjtXAoQlpgTkL7SMYvj348sjKVJtzusB56XsKYM29J7BFt4FIk9oFOE1YUUtetz3agrrxid0QbFahySjATcCvlKEuU1QpCfcCR0KDgzUJ3i0/9kE7Y5uCjxA59HFfakhwI3Ve3KlBbcZ3eTFi1Tc/P1X6PR9UCl7ruDg++2uB+9OFYnOT3N+rxhEFX5ZbRMrVqIka/0V5FIWd2YTesGd7QhOqoGwzFHz0IUcZtYuhImacCZTvtjz6WdDq3Qc7UDnvyOu+KDOjaLgkNgBJea7/1ArQ==
- References: <20190721015238.2127-1-kbrown@cornell.edu>
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.
---
winsup/cygwin/fhandler.h | 3 ---
winsup/cygwin/fhandler_raw.cc | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 0da87e985..e0a8d4101 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -414,7 +414,6 @@ public:
virtual bool is_tty () const { return false; }
virtual bool ispipe () const { return false; }
virtual pid_t get_popen_pid () const {return 0;}
- virtual bool isdevice () const { return true; }
virtual bool isfifo () const { return false; }
virtual int ptsname_r (char *, size_t);
virtual class fhandler_socket *is_socket () { return NULL; }
@@ -459,7 +458,6 @@ public:
virtual void seekdir (DIR *, long);
virtual void rewinddir (DIR *);
virtual int closedir (DIR *);
- bool is_auto_device () {return isdevice () && !dev ().isfs ();}
bool is_fs_special () {return pc.is_fs_special ();}
bool issymlink () {return pc.issymlink ();}
bool __reg2 device_access_denied (int);
@@ -1455,7 +1453,6 @@ class fhandler_disk_file: public fhandler_base
int dup (fhandler_base *child, int);
void fixup_after_fork (HANDLE parent);
int mand_lock (int, struct flock *);
- bool isdevice () const { return false; }
int __reg2 fstat (struct stat *buf);
int __reg1 fchmod (mode_t mode);
int __reg2 fchown (uid_t uid, gid_t gid);
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc
index bd47b6010..7c341d895 100644
--- a/winsup/cygwin/fhandler_raw.cc
+++ b/winsup/cygwin/fhandler_raw.cc
@@ -38,7 +38,7 @@ fhandler_dev_raw::fstat (struct stat *buf)
debug_printf ("here");
fhandler_base::fstat (buf);
- if (is_auto_device ())
+ if (!dev ().isfs ())
{
if (get_major () == DEV_TAPE_MAJOR)
buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
--
2.21.0