From f3e00d6788856aa52afa7eae281d81b274d7e9b9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 5 Sep 2009 23:25:38 +0200 Subject: remove(): slight readabability tweak, no code changes Signed-off-by: Denys Vlasenko --- libc/stdio/remove.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libc/stdio') 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 #include -/* 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); } -- cgit v1.2.3