Make conversion-to-bool explicit to avoid warnings on legacy systems

diff --git a/NEWS.txt b/NEWS.txt
index eaeadf6e2d1fce7114e99e373cba53737014fca2..2776836f86006a7605f9e19c193e493fee95f941 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -11,6 +11,9 @@ Bug fixes
 - Fixed build error related to zlib on systems with older make versions
   (regression in ccache 3.2.3).
 
+- Made conversion-to-bool explicit to avoid build warnings (and potential
+  runtime errors) on legacy systems.
+
 
 ccache 3.2.3
 ------------

diff --git a/ccache.c b/ccache.c
index c69745f5dec54e0dfc4d030f9c2c4296dc8264ef..d47b1919ee6ae6abd5cd2e8b0185f147d6785865 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -1263,7 +1263,7 @@ static bool
 compiler_is_clang(struct args *args)
 {
        char *name = basename(args->argv[0]);
-       bool is = strstr(name, "clang");
+       bool is = strstr(name, "clang") != NULL;
        free(name);
        return is;
 }

diff --git a/conf.c b/conf.c
index cc092f24dccfec7c363308955c3d6c7a94a6c736..e8bd523d3819cb3a2190cb26dd0f471ae21d61a7 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -58,7 +58,7 @@ parse_env_string(const char *str, void *result, char **errmsg)
        char **value = (char **)result;
        free(*value);
        *value = subst_env_in_string(str, errmsg);
-       return *value;
+       return *value != NULL;
 }
 
 static bool

diff --git a/language.c b/language.c
index 78c4a7d0262d8ee38693c55832905918c5d59eb2..77d6cc2a630fa5b7a4e90fdb7b7b0e071eec9708 100644 (file)
--- a/language.c
+++ b/language.c
@@ -149,7 +149,7 @@ extension_for_language(const char *language)
 bool
 language_is_supported(const char *language)
 {
-       return p_language_for_language(language);
+       return p_language_for_language(language) != NULL;
 }
 
 bool

diff --git a/util.c b/util.c
index 2526bbe496cdf0e43d4ebac0f92d0d543580d7c4..59cf43575f10704abf9ff98af88dda04feb99be8 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1638,7 +1638,7 @@ expand_variable(const char **str, char **result, char **errmsg)
        if (curly) {
                if (*q != '}') {
                        *errmsg = format("syntax error: missing '}' after \"%s\"", p);
-                       return NULL;
+                       return false;
                }
        }