From 86d1ed7708fc577bb576b0c8725b513c9758eb36 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 15 Jan 2009 19:32:47 +0100 Subject: [PATCH] Make the loglevels start at zero. We want to use an array of size NUM_LOGLEVELS. --- para.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/para.h b/para.h index 4022bec7..fcc24746 100644 --- a/para.h +++ b/para.h @@ -50,61 +50,63 @@ _x > 0? _x : -_x; }) /** Debug loglevel, gets really noisy. */ -#define LL_DEBUG 1 +#define LL_DEBUG 0 /** Still noisy, but won't fill your disk. */ -#define LL_INFO 2 +#define LL_INFO 1 /** Normal, but significant event. */ -#define LL_NOTICE 3 +#define LL_NOTICE 2 /** Unexpected event that can be handled. */ -#define LL_WARNING 4 +#define LL_WARNING 3 /** Unhandled error condition. */ -#define LL_ERROR 5 +#define LL_ERROR 4 /** System might be unreliable. */ -#define LL_CRIT 6 +#define LL_CRIT 5 /** Last message before exit. */ -#define LL_EMERG 7 +#define LL_EMERG 6 +/** Number of all loglevels. */ +#define NUM_LOGLEVELS 7 /** Log messages with lower priority than that will not be compiled in. */ #define COMPILE_TIME_LOGLEVEL 0 /** \cond */ -#if LL_DEBUG > COMPILE_TIME_LOGLEVEL +#if LL_DEBUG >= COMPILE_TIME_LOGLEVEL #define PARA_DEBUG_LOG(f,...) para_log(LL_DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_DEBUG_LOG(...) do {;} while (0) #endif -#if LL_INFO > COMPILE_TIME_LOGLEVEL +#if LL_INFO >= COMPILE_TIME_LOGLEVEL #define PARA_INFO_LOG(f,...) para_log(LL_INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_INFO_LOG(...) do {;} while (0) #endif -#if LL_NOTICE > COMPILE_TIME_LOGLEVEL +#if LL_NOTICE >= COMPILE_TIME_LOGLEVEL #define PARA_NOTICE_LOG(f,...) para_log(LL_NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_NOTICE_LOG(...) do {;} while (0) #endif -#if LL_WARNING > COMPILE_TIME_LOGLEVEL +#if LL_WARNING >= COMPILE_TIME_LOGLEVEL #define PARA_WARNING_LOG(f,...) para_log(LL_WARNING, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_WARNING_LOG(...) do {;} while (0) #endif -#if LL_ERROR > COMPILE_TIME_LOGLEVEL +#if LL_ERROR >= COMPILE_TIME_LOGLEVEL #define PARA_ERROR_LOG(f,...) para_log(LL_ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_ERROR_LOG(...) do {;} while (0) #endif -#if LL_CRIT > COMPILE_TIME_LOGLEVEL +#if LL_CRIT >= COMPILE_TIME_LOGLEVEL #define PARA_CRIT_LOG(f,...) para_log(LL_CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_CRIT_LOG(...) do {;} while (0) #endif -#if LL_EMERG > COMPILE_TIME_LOGLEVEL +#if LL_EMERG >= COMPILE_TIME_LOGLEVEL #define PARA_EMERG_LOG(f,...) para_log(LL_EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__) #else #define PARA_EMERG_LOG(...) -- 2.39.5