From 176c3f21b43f544b1f710824ce4fb4c0936b3533 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 13 Aug 2007 17:16:05 +0000 Subject: * Makefile.in (DLL_OFILES): Remove delqueue.o. * delqueue.cc: Delete. * fhandler.h (fhandler_base::close_fs): Drop declaration. (fhandler_disk_file::close): Drop declaration. * fhandler_disk_file.cc (fhandler_base::fstat_fs): Call close instead of close_fs. (fhandler_base::fstat_helper): Use open FH_UNIX handle in call to get_file_attribute. (fhandler_base::open_fs): Call close instead of get_file_attribute. (fhandler_disk_file::close): Remove. (fhandler_base::close_fs): Remove. * fhandler_socket.cc (fhandler_socket::close): Just call fhandler_base::close for FH_UNIX sockets. * shared.cc (user_shared_initialize): Drop call to user_shared->delqueue.init. * shared_info.h (CURR_USER_MAGIC): Change according to below change. (MAX_DELQUEUES_PENDING): Remove. (class delqueue_list): Remove. (class user_info): Remove delqueue. * syscalls.cc (close_all_files): Drop call to user_shared->delqueue.process_queue. (unlink): Drop delqueue handling. --- winsup/cygwin/syscalls.cc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'winsup/cygwin/syscalls.cc') diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 342e51e92..5df131ea7 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -124,7 +124,6 @@ close_all_files (bool norelease) cygheap->close_ctty (); cygheap->fdtab.unlock (); - user_shared->delqueue.process_queue (); } int @@ -558,18 +557,7 @@ unlink (const char *ourname) if (NT_SUCCESS (status)) res = 0; else - { - /* FIXME: Can we get rid of the delqueue now? */ - if (status == STATUS_SHARING_VIOLATION) - { - /* Add file to the "to be deleted" queue. */ - syscall_printf ("Sharing violation, couldn't delete file"); - user_shared->delqueue.queue_file (win32_name); - res = 0; - } - else - __seterrno_from_nt_status (status); - } + __seterrno_from_nt_status (status); done: syscall_printf ("%d = unlink (%s)", res, ourname); -- cgit v1.2.3