From bd8f891e8ac6ec88bc72cd8c446b6ccba5750821 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 22 Feb 2007 11:17:01 +0000 Subject: Throughout replace all usage of wincap.shared with the constant FILE_SHARE_VALID_FLAGS. * fhandler.cc (fhandler_base::open_9x): Drop local variable shared. * wincap.cc: Remove shared member throughout. * wincap.h: Ditto. --- winsup/cygwin/syscalls.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/syscalls.cc') diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index c72e2428b..5e2bb5b66 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -283,7 +283,8 @@ unlink_nt (path_conv &win32_name, bool setattrs) if (status == STATUS_SHARING_VIOLATION) { move_to_bin = true; - status = NtOpenFile (&h, DELETE, &attr, &io, wincap.shared (), flags); + status = NtOpenFile (&h, DELETE, &attr, &io, FILE_SHARE_VALID_FLAGS, + flags); } if (!NT_SUCCESS (status)) { @@ -1114,7 +1115,7 @@ EXPORT_ALIAS (fsync, fdatasync) static void sync_worker (const char *vol) { - HANDLE fh = CreateFileA (vol, GENERIC_WRITE, wincap.shared (), + HANDLE fh = CreateFileA (vol, GENERIC_WRITE, FILE_SHARE_VALID_FLAGS, &sec_none_nih, OPEN_EXISTING, 0, NULL); if (fh != INVALID_HANDLE_VALUE) { @@ -1944,7 +1945,7 @@ statvfs (const char *fname, struct statvfs *sfs) { /* Quotas active. We can't trust totalc. */ HANDLE hdl = CreateFile (full_path, READ_CONTROL, - wincap.shared (), &sec_none_nih, + FILE_SHARE_VALID_FLAGS, &sec_none_nih, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); if (hdl == INVALID_HANDLE_VALUE) -- cgit v1.2.3