diff options
| -rw-r--r-- | src/util/u_cpu_detect.h | 1 | ||||
| -rw-r--r-- | src/util/u_debug.c | 45 | ||||
| -rw-r--r-- | src/util/u_debug.h | 32 |
3 files changed, 38 insertions, 40 deletions
diff --git a/src/util/u_cpu_detect.h b/src/util/u_cpu_detect.h index efc910d1473..a09aca8fbac 100644 --- a/src/util/u_cpu_detect.h +++ b/src/util/u_cpu_detect.h @@ -36,7 +36,6 @@ #define _UTIL_CPU_DETECT_H -#include "pipe/p_compiler.h" #include "pipe/p_config.h" diff --git a/src/util/u_debug.c b/src/util/u_debug.c index cd31ca6e130..e1c8265965f 100644 --- a/src/util/u_debug.c +++ b/src/util/u_debug.c @@ -29,7 +29,6 @@ #include "pipe/p_config.h" -#include "pipe/p_compiler.h" #include "util/u_debug.h" #include "pipe/p_format.h" #include "pipe/p_state.h" @@ -123,11 +122,11 @@ debug_print_blob(const char *name, const void *blob, unsigned size) #endif -static boolean +static bool debug_get_option_should_print(void) { - static boolean first = TRUE; - static boolean value = FALSE; + static bool first = true; + static bool value = false; if (!first) return value; @@ -135,8 +134,8 @@ debug_get_option_should_print(void) /* Oh hey this will call into this function, * but its cool since we set first to false */ - first = FALSE; - value = debug_get_bool_option("GALLIUM_PRINT_OPTIONS", FALSE); + first = false; + value = debug_get_bool_option("GALLIUM_PRINT_OPTIONS", false); /* XXX should we print this option? Currently it wont */ return value; } @@ -159,30 +158,30 @@ debug_get_option(const char *name, const char *dfault) } -boolean -debug_get_bool_option(const char *name, boolean dfault) +bool +debug_get_bool_option(const char *name, bool dfault) { const char *str = os_get_option(name); - boolean result; + bool result; if (str == NULL) result = dfault; else if (!strcmp(str, "n")) - result = FALSE; + result = false; else if (!strcmp(str, "no")) - result = FALSE; + result = false; else if (!strcmp(str, "0")) - result = FALSE; + result = false; else if (!strcmp(str, "f")) - result = FALSE; + result = false; else if (!strcmp(str, "F")) - result = FALSE; + result = false; else if (!strcmp(str, "false")) - result = FALSE; + result = false; else if (!strcmp(str, "FALSE")) - result = FALSE; + result = false; else - result = TRUE; + result = true; if (debug_get_option_should_print()) debug_printf("%s: %s = %s\n", __FUNCTION__, name, @@ -218,17 +217,17 @@ debug_get_num_option(const char *name, long dfault) } -static boolean +static bool str_has_option(const char *str, const char *name) { /* Empty string. */ if (!*str) { - return FALSE; + return false; } /* OPTION=all */ if (!strcmp(str, "all")) { - return TRUE; + return true; } /* Find 'name' in 'str' surrounded by non-alphanumeric characters. */ @@ -245,11 +244,11 @@ str_has_option(const char *str, const char *name) if (!*str || !(isalnum(*str) || *str == '_')) { if (str-start == name_len && !memcmp(start, name, name_len)) { - return TRUE; + return true; } if (!*str) { - return FALSE; + return false; } start = str+1; @@ -259,7 +258,7 @@ str_has_option(const char *str, const char *name) } } - return FALSE; + return false; } diff --git a/src/util/u_debug.h b/src/util/u_debug.h index 2136920417a..bc6cd8ac2a9 100644 --- a/src/util/u_debug.h +++ b/src/util/u_debug.h @@ -110,9 +110,9 @@ debug_printf(const char *format, ...) */ #define debug_printf_once(args) \ do { \ - static boolean once = TRUE; \ + static bool once = true; \ if (once) { \ - once = FALSE; \ + once = false; \ debug_printf args; \ } \ } while (0) @@ -236,11 +236,11 @@ void _debug_assert_fail(const char *expr, #ifdef DEBUG #define debug_warn_once(__msg) \ do { \ - static bool warned = FALSE; \ + static bool warned = false; \ if (!warned) { \ _debug_printf("%s:%u:%s: one time warning: %s\n", \ __FILE__, __LINE__, __FUNCTION__, __msg); \ - warned = TRUE; \ + warned = true; \ } \ } while (0) #else @@ -390,8 +390,8 @@ void debug_funclog_enter_exit(const char* f, const int line, const char* file); const char * debug_get_option(const char *name, const char *dfault); -boolean -debug_get_bool_option(const char *name, boolean dfault); +bool +debug_get_bool_option(const char *name, bool dfault); long debug_get_num_option(const char *name, long dfault); @@ -405,23 +405,23 @@ debug_get_flags_option(const char *name, static const char * \ debug_get_option_ ## suffix (void) \ { \ - static boolean first = TRUE; \ + static bool first = true; \ static const char * value; \ if (first) { \ - first = FALSE; \ + first = false; \ value = debug_get_option(name, dfault); \ } \ return value; \ } #define DEBUG_GET_ONCE_BOOL_OPTION(sufix, name, dfault) \ -static boolean \ +static bool \ debug_get_option_ ## sufix (void) \ { \ - static boolean first = TRUE; \ - static boolean value; \ + static bool first = true; \ + static bool value; \ if (first) { \ - first = FALSE; \ + first = false; \ value = debug_get_bool_option(name, dfault); \ } \ return value; \ @@ -431,10 +431,10 @@ debug_get_option_ ## sufix (void) \ static long \ debug_get_option_ ## sufix (void) \ { \ - static boolean first = TRUE; \ + static bool first = true; \ static long value; \ if (first) { \ - first = FALSE; \ + first = false; \ value = debug_get_num_option(name, dfault); \ } \ return value; \ @@ -444,10 +444,10 @@ debug_get_option_ ## sufix (void) \ static unsigned long \ debug_get_option_ ## sufix (void) \ { \ - static boolean first = TRUE; \ + static bool first = true; \ static unsigned long value; \ if (first) { \ - first = FALSE; \ + first = false; \ value = debug_get_flags_option(name, flags, dfault); \ } \ return value; \ |