summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2013-09-02 21:30:47 +0100
committerAllan McRae <allan@archlinux.org>2013-09-04 09:51:20 +1000
commit8a72761743d746ed0a9b8b1201672e8ea0b8af4d (patch)
tree1bd3d2cd1032e3c52d39f3db91627afee776c9a8
parenta86015f73fdda878287a2ad21011594862bf506a (diff)
downloadpacman-8a72761743d746ed0a9b8b1201672e8ea0b8af4d.tar.xz
pacman/util.c: use switch when there are fall through statements
An 'if' clause with empty statement is allowed, but unusual construct. When 'if' is used this way the statement should at least have orphan semicolon ';'. For empty statements 'switch' feels like a native way express what is meant. Signed-off-by: Sami Kerola <kerolasa@iki.fi> [Allan] Keep comment Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--src/pacman/util.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 9eb0042e..6da1cd40 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -190,15 +190,13 @@ int rmrf(const char *path)
if(!unlink(path)) {
return 0;
} else {
- if(errno == ENOENT) {
+ switch(errno) {
+ case ENOENT:
return 0;
- } else if(errno == EPERM) {
- /* fallthrough */
- } else if(errno == EISDIR) {
- /* fallthrough */
- } else if(errno == ENOTDIR) {
- return 1;
- } else {
+ case EPERM:
+ case EISDIR:
+ break;
+ default:
/* not a directory */
return 1;
}