libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-09 02:29:07 +08:00
Code Issues Projects Releases Wiki Activity

syscalls.cc: Deduplicate remove

Browse Source 
The remove code is already in the _remove_r function.
So, just call the _remove_r function.
This commit is contained in:
Ben Wijen 2021-01-22 16:47:12 +01:00 committed by Ken Brown
parent 0a7e412a19
commit 7425218eee
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
winsup/cygwin/syscalls.cc
View File

@ -1161,24 +1161,15 @@ _remove_r (struct _reent *, const char *ourname)
return -1; 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 extern "C" int
remove (const char *ourname) remove (const char *ourname)
{ {
path_conv win32_name (ourname, PC_SYM_NOFOLLOW); return _remove_r (_REENT, ourname);
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;
} }
extern "C" pid_t extern "C" pid_t