mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-02-08 18:19:08 +08:00
syscalls.cc: Deduplicate remove
The remove code is already in the _remove_r function. So, just call the _remove_r function.
This commit is contained in:
parent
0a7e412a19
commit
7425218eee
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user