From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id E38B8385781A; Mon, 25 Jan 2021 18:58:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E38B8385781A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] syscalls.cc: Deduplicate remove X-Act-Checkin: newlib-cygwin X-Git-Author: Ben Wijen X-Git-Refname: refs/heads/master X-Git-Oldrev: 460eb128cb514c32a8c8b4be17eeb8ce3b888d6b X-Git-Newrev: f4cac1217e76b30afb55e680a909fa8a62b6088e Message-Id: <20210125185844.E38B8385781A@sourceware.org> Date: Mon, 25 Jan 2021 18:58:44 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2021 18:58:45 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f4cac1217e76b30afb55e680a909fa8a62b6088e commit f4cac1217e76b30afb55e680a909fa8a62b6088e Author: Ben Wijen Date: Fri Jan 22 16:47:12 2021 +0100 syscalls.cc: Deduplicate remove The remove code is already in the _remove_r function. So, just call the _remove_r function. Diff: --- winsup/cygwin/syscalls.cc | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index b3a110aaa..4cc8d07f5 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1161,24 +1161,15 @@ _remove_r (struct _reent *, const char *ourname) return -1; } - return win32_name.isdir () ? rmdir (ourname) : unlink (ourname); + int res = win32_name.isdir () ? rmdir (ourname) : unlink (ourname); + syscall_printf ("%R = remove(%s)", res, ourname); + return res; } extern "C" int remove (const char *ourname) { - path_conv win32_name (ourname, PC_SYM_NOFOLLOW); - - if (win32_name.error) - { - set_errno (win32_name.error); - syscall_printf ("-1 = remove (%s)", ourname); - return -1; - } - - int res = win32_name.isdir () ? rmdir (ourname) : unlink (ourname); - syscall_printf ("%R = remove(%s)", res, ourname); - return res; + return _remove_r (_REENT, ourname); } extern "C" pid_t