]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Use strcmp == 0 instead of !strcmp
authorJoel Rosdahl <joel@rosdahl.net>
Sat, 17 Jul 2010 14:51:55 +0000 (16:51 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Sat, 17 Jul 2010 14:51:55 +0000 (16:51 +0200)
execute.c
util.c

index 3a8b34afc9bece93265d78bb9a02a498d544af3f..30674ff902b007de28c48d666e81e8fe53bd1e75 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -114,7 +114,7 @@ int win32execute(char *path, char **argv, int doreturn,
        memset(&si, 0x00, sizeof(si));
 
        ext = get_extension(path);
-       if (ext && !strcasecmp(ext, ".sh") && (path_env = getenv("PATH")))
+       if (ext && strcasecmp(ext, ".sh") == 0 && (path_env = getenv("PATH")))
                sh = find_executable_in_path("sh.exe", NULL, path_env);
        if (!sh && getenv("CCACHE_DETECT_SHEBANG")) {
                /* Detect shebang. */
@@ -124,7 +124,7 @@ int win32execute(char *path, char **argv, int doreturn,
                        char buf[10];
                        fgets(buf, sizeof(buf), fp);
                        buf[9] = 0;
-                       if (!strcmp(buf, "#!/bin/sh") && (path_env = getenv("PATH")))
+                       if (strcmp(buf, "#!/bin/sh") == 0 && (path_env = getenv("PATH")))
                                sh = find_executable_in_path("sh.exe", NULL, path_env);
                        fclose(fp);
                }
diff --git a/util.c b/util.c
index f887ed02b3f1fdb29fa2dc2187a5e66868cbce7f..13e84ccb353041cd00430be626db06f6949ed9c7 100644 (file)
--- a/util.c
+++ b/util.c
@@ -922,16 +922,16 @@ int
 compare_executable_name(const char *s1, const char *s2)
 {
 #ifdef _WIN32
-       int ret = !strcasecmp(s1, s2);
-       if (!ret) {
+       int eq = strcasecmp(s1, s2) == 0;
+       if (!eq) {
                char *tmp;
                x_asprintf(&tmp, "%s.exe", s2);
-               ret = !strcasecmp(s1, tmp);
+               eq = strcasecmp(s1, tmp) == 0;
                free(tmp);
        }
-       return ret;
+       return eq;
 #else
-       return !strcmp(s1, s2);
+       return strcmp(s1, s2) == 0;
 #endif
 }