From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 904EA3858002; Mon, 20 Mar 2023 11:58:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 904EA3858002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679313514; bh=88Qbdap2rTjg8MJRn6R9MWOxUgxPfD8FOMlhpnCNCg4=; h=From:To:Subject:Date:From; b=CoucQFkH591c9a4QkkBW/JBZkmnKRSh3sq5Qrau2kl5ChPosjjuUHw3McYxE1yxr1 m0RIkr74/AgWkLu9IWch+3jh5DIFihplRaqopfIwBoweO5vQFCLCMmwop7Uvq31xgX CiTMEXaJSPKXra1R+FiwtfWkCzg/sntYjCXMDFzk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: unlink: drop unlink_nt/unlink_nt_shareable wrappers X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: fcccdc4021ffbe86c5ea6bb3b5c64b95c98f4ed4 X-Git-Newrev: 271292b1fbdc7da7c1ed678836eebe596170e635 Message-Id: <20230320115834.904EA3858002@sourceware.org> Date: Mon, 20 Mar 2023 11:58:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D271292b1fbd= c7da7c1ed678836eebe596170e635 commit 271292b1fbdc7da7c1ed678836eebe596170e635 Author: Corinna Vinschen AuthorDate: Mon Mar 20 12:23:36 2023 +0100 Commit: Corinna Vinschen CommitDate: Mon Mar 20 12:55:30 2023 +0100 Cygwin: unlink: drop unlink_nt/unlink_nt_shareable wrappers =20 Useless indirection. Rename _unlink_nt back to unlink_nt and call the function directly with `sharable' flag as needed. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler/disk_file.cc | 4 ++-- winsup/cygwin/forkable.cc | 4 ++-- winsup/cygwin/syscalls.cc | 24 ++++++------------------ 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/winsup/cygwin/fhandler/disk_file.cc b/winsup/cygwin/fhandler/d= isk_file.cc index 8528f7f8d4de..19c976aaae41 100644 --- a/winsup/cygwin/fhandler/disk_file.cc +++ b/winsup/cygwin/fhandler/disk_file.cc @@ -1836,7 +1836,7 @@ fhandler_disk_file::mkdir (mode_t mode) int fhandler_disk_file::rmdir () { - extern NTSTATUS unlink_nt (path_conv &pc); + extern NTSTATUS unlink_nt (path_conv &pc, bool sharable); =20 if (!pc.isdir ()) { @@ -1849,7 +1849,7 @@ fhandler_disk_file::rmdir () return -1; } =20 - NTSTATUS status =3D unlink_nt (pc); + NTSTATUS status =3D unlink_nt (pc, false); =20 if (!NT_SUCCESS (status)) { diff --git a/winsup/cygwin/forkable.cc b/winsup/cygwin/forkable.cc index fbc30ae3028f..c69c8bea9e98 100644 --- a/winsup/cygwin/forkable.cc +++ b/winsup/cygwin/forkable.cc @@ -29,7 +29,7 @@ details. */ =20 /* Allow concurrent processes to use the same dll or exe * via their hardlink while we delete our hardlink. */ -extern NTSTATUS unlink_nt_shareable (path_conv &pc); +extern NTSTATUS unlink_nt (path_conv &pc, bool sharable); =20 #define MUTEXSEP L"@" #define PATHSEP L"\\" @@ -132,7 +132,7 @@ rmdirs (WCHAR ntmaxpathbuf[NT_MAX_PATH]) RtlInitUnicodeString (&fn, ntmaxpathbuf); =20 path_conv pc (&fn); - unlink_nt_shareable (pc); /* move to bin */ + unlink_nt (pc, true); /* move to bin */ } =20 if (!pfdi->NextEntryOffset) diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 8ae0397fb184..af4f870851eb 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -665,8 +665,8 @@ _unlink_nt_post_dir_check (NTSTATUS status, POBJECT_ATT= RIBUTES attr, const path_ return status; } =20 -static NTSTATUS -_unlink_nt (path_conv &pc, bool shareable) +NTSTATUS +unlink_nt (path_conv &pc, bool shareable) { NTSTATUS status; HANDLE fh, fh_ro =3D NULL; @@ -1062,18 +1062,6 @@ out: return status; } =20 -NTSTATUS -unlink_nt (path_conv &pc) -{ - return _unlink_nt (pc, false); -} - -NTSTATUS -unlink_nt_shareable (path_conv &pc) -{ - return _unlink_nt (pc, true); -} - extern "C" int unlink (const char *ourname) { @@ -1113,7 +1101,7 @@ unlink (const char *ourname) goto done; } =20 - status =3D unlink_nt (win32_name); + status =3D unlink_nt (win32_name, false); if (NT_SUCCESS (status)) res =3D 0; else @@ -2504,7 +2492,7 @@ rename2 (const char *oldpath, const char *newpath, un= signed int at2flags) unlink_nt returns with STATUS_DIRECTORY_NOT_EMPTY. */ if (dstpc->isdir ()) { - status =3D unlink_nt (*dstpc); + status =3D unlink_nt (*dstpc, false); if (!NT_SUCCESS (status)) { __seterrno_from_nt_status (status); @@ -2645,7 +2633,7 @@ skip_pre_W10_checks: ? FILE_OPEN_REPARSE_POINT : 0)); if (NT_SUCCESS (status)) { - status =3D unlink_nt (*dstpc); + status =3D unlink_nt (*dstpc, false); if (NT_SUCCESS (status)) break; } @@ -2665,7 +2653,7 @@ skip_pre_W10_checks: if (NT_SUCCESS (status)) { if (removepc) - unlink_nt (*removepc); + unlink_nt (*removepc, false); res =3D 0; } else