[utils/log] force sign of enum to suppress warning

QtCurve · Oct 14, 2013 · bf683e0 · bf683e0
1 parent 0ffbeb1
commit bf683e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/qtcurve-utils/log.c b/qtcurve-utils/log.c
@@ -121,7 +121,8 @@ _qtcLogV(QtcLogLevel level, const char *fname, int line, const char *func,
          const char *fmt, va_list ap)
 {
     _qtcLogInit();
-    if (qtcUnlikely(level < log_level || level < 0 || level > QTC_LOG_FORCE))
+    if (qtcUnlikely(level < log_level || ((int)level) < 0 ||
+                    level > QTC_LOG_FORCE))
         return;
 
     static const char *color_codes[] = {

diff --git a/qtcurve-utils/log.h b/qtcurve-utils/log.h
@@ -72,10 +72,11 @@ void _qtcLogV(QtcLogLevel level, const char *fname, int line, const char *func,
               const char *fmt, va_list ap);
 
 #define qtcLog(__level, fmt, args...) do {                              \
-        QtcLogLevel level = (__level);                                  \
-        if (level < 0 || level > QTC_LOG_FORCE || level < qtcLogLevel)  \
+        unsigned level = (__level);                                     \
+        if (level > QTC_LOG_FORCE || level < qtcLogLevel)               \
             break;                                                      \
-        _qtcLog(level, __FILE__, __LINE__, __FUNCTION__, fmt, ##args);  \
+        _qtcLog((QtcLogLevel)level, __FILE__, __LINE__, __FUNCTION__,   \
+                fmt, ##args);                                           \
     } while (0)
 
 #define qtcDebug(fmt, args...)                  \