summaryrefslogtreecommitdiffstats
path: root/src/pacman/util.c
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-06-19 10:55:08 +0200
committerAllan McRae <allan@archlinux.org>2010-06-20 17:04:58 +0200
commit59c47aaf529df02ec1577fe727c3c84d13592666 (patch)
tree63049bcc89e7058376ce0607ddee116b2f819ddc /src/pacman/util.c
parentd7dccd541962f0dd8bf323ae11633e595bfb4922 (diff)
downloadpacman-59c47aaf529df02ec1577fe727c3c84d13592666.tar.gz
pacman-59c47aaf529df02ec1577fe727c3c84d13592666.tar.xz
Clarify testing within conditional statements
Follow the HACKING guidelines and always use != 0 or == 0 rather than negation within conditional statements to improve clarity. Most of these are !strcmp usages which is the example of what not to do in the HACKING document. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/util.c')
-rw-r--r--src/pacman/util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 0cae6d7c..de1b1626 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -142,7 +142,7 @@ int rmrf(const char *path)
if(dp->d_ino) {
char name[PATH_MAX];
sprintf(name, "%s/%s", path, dp->d_name);
- if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) {
+ if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) {
errflag += rmrf(name);
}
}
@@ -718,9 +718,9 @@ static int question(short preset, char *fmt, va_list args)
return(preset);
}
- if(!strcasecmp(response, _("Y")) || !strcasecmp(response, _("YES"))) {
+ if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) {
return(1);
- } else if (!strcasecmp(response, _("N")) || !strcasecmp(response, _("NO"))) {
+ } else if (strcasecmp(response, _("N")) == 0 || strcasecmp(response, _("NO")) == 0) {
return(0);
}
}