summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-09-05 23:25:38 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-09-05 23:25:38 +0200
commitf3e00d6788856aa52afa7eae281d81b274d7e9b9 (patch)
tree6b661a487922002b854abd84ca9eaa93c9f2776e
parentbe6b7aa33991cc8473bc5d410b251fc0913727d1 (diff)
remove(): slight readabability tweak, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libc/stdio/remove.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c
index c186164b8..af2850733 100644
--- a/libc/stdio/remove.c
+++ b/libc/stdio/remove.c
@@ -10,22 +10,19 @@
#include <unistd.h>
#include <errno.h>
-/* libc_hidden_proto(rmdir) */
-/* libc_hidden_proto(unlink) */
-
/* SUSv3 states:
* If path does not name a directory, remove(path) shall be equivalent
* to unlink(path). If path names a directory, remove(path) shall be
* equivalent to rmdir(path).
*/
-/* libc_hidden_proto(remove) */
int remove(register const char *filename)
{
int saved_errno = errno;
int rv;
- if (((rv = rmdir(filename)) < 0) && (errno == ENOTDIR)) {
+ rv = rmdir(filename);
+ if ((rv < 0) && (errno == ENOTDIR)) {
__set_errno(saved_errno); /* Need to restore errno. */
rv = unlink(filename);
}