ctdb-common: Fix signed/unsigned comparisons by casting

In one case, given triviality of change, add missing braces and fix
whitespace.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/common/logging.c b/ctdb/common/logging.c
index fd763170304503eca6d697ff59becc88db0679c0..a4321b68ba9c7c91b597c4411d4b8dfe4040ba7f 100644 (file)
--- a/ctdb/common/logging.c
+++ b/ctdb/common/logging.c
@@ -63,7 +63,7 @@ bool debug_level_parse(const char *log_string, int *log_level)
        if (isdigit(log_string[0])) {
                int level = atoi(log_string);
 
-               if (level >= 0 && level < ARRAY_SIZE(log_string_map)) {
+               if (level >= 0 && (size_t)level < ARRAY_SIZE(log_string_map)) {
                        *log_level = level;
                        return true;
                }
@@ -253,12 +253,12 @@ static int debug_level_to_priority(int level)
         };
         int priority;
 
-        if( level >= ARRAY_SIZE(priority_map) || level < 0)
-                priority = LOG_DEBUG;
-        else
-                priority = priority_map[level];
-
-        return priority;
+       if ((size_t)level >= ARRAY_SIZE(priority_map) || level < 0) {
+               priority = LOG_DEBUG;
+       } else {
+               priority = priority_map[level];
+       }
+       return priority;
 }
 
 struct syslog_log_state {

diff --git a/ctdb/common/path.c b/ctdb/common/path.c
index 69e606b4ede40a11aa7cdb58deaf3c2e92f23690..ea3b08f4b2eb04446fc20b1d26246ab884a6da3b 100644 (file)
--- a/ctdb/common/path.c
+++ b/ctdb/common/path.c
@@ -89,7 +89,7 @@ static bool path_construct(char *path, const char *subdir)
                               subdir);
        }
 
-       if (len >= sizeof(p)) {
+       if ((size_t)len >= sizeof(p)) {
                return false;
        }