diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-18 19:37:18 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-18 19:37:18 +0000 |
| commit | 308e1940dcd64aa6c344c403d4f9e0dda58d9c5c (patch) | |
| tree | 35fe43e01755e0f312650667004487a44d6b7941 /src/nvim/log.h | |
| parent | 96a00c7c588b2f38a2424aeeb4ea3581d370bf2d (diff) | |
| parent | e8c94697bcbe23a5c7b07c292b90a6b70aadfa87 (diff) | |
| download | rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.tar.gz rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.tar.bz2 rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'src/nvim/log.h')
| -rw-r--r-- | src/nvim/log.h | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/src/nvim/log.h b/src/nvim/log.h index 81e39d1cdd..cbee0e0f81 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -16,12 +16,11 @@ # define NVIM_PROBE(name, n, ...) #endif - -#define TRACE_LOG_LEVEL 0 -#define DEBUG_LOG_LEVEL 1 -#define INFO_LOG_LEVEL 2 -#define WARN_LOG_LEVEL 3 -#define ERROR_LOG_LEVEL 4 +#define LOGLVL_TRC 0 +#define LOGLVL_DBG 1 +#define LOGLVL_INF 2 +#define LOGLVL_WRN 3 +#define LOGLVL_ERR 4 #define DLOG(...) #define DLOGN(...) @@ -33,46 +32,37 @@ #define ELOGN(...) #ifndef MIN_LOG_LEVEL -# define MIN_LOG_LEVEL INFO_LOG_LEVEL +# define MIN_LOG_LEVEL LOGLVL_INF #endif -#define LOG(level, ...) logmsg((level), NULL, __func__, __LINE__, true, \ - __VA_ARGS__) +#define LOG(level, ...) logmsg((level), NULL, __func__, __LINE__, true, __VA_ARGS__) -#if MIN_LOG_LEVEL <= DEBUG_LOG_LEVEL +#if MIN_LOG_LEVEL <= LOGLVL_DBG # undef DLOG # undef DLOGN -# define DLOG(...) logmsg(DEBUG_LOG_LEVEL, NULL, __func__, __LINE__, true, \ - __VA_ARGS__) -# define DLOGN(...) logmsg(DEBUG_LOG_LEVEL, NULL, __func__, __LINE__, false, \ - __VA_ARGS__) +# define DLOG(...) logmsg(LOGLVL_DBG, NULL, __func__, __LINE__, true, __VA_ARGS__) +# define DLOGN(...) logmsg(LOGLVL_DBG, NULL, __func__, __LINE__, false, __VA_ARGS__) #endif -#if MIN_LOG_LEVEL <= INFO_LOG_LEVEL +#if MIN_LOG_LEVEL <= LOGLVL_INF # undef ILOG # undef ILOGN -# define ILOG(...) logmsg(INFO_LOG_LEVEL, NULL, __func__, __LINE__, true, \ - __VA_ARGS__) -# define ILOGN(...) logmsg(INFO_LOG_LEVEL, NULL, __func__, __LINE__, false, \ - __VA_ARGS__) +# define ILOG(...) logmsg(LOGLVL_INF, NULL, __func__, __LINE__, true, __VA_ARGS__) +# define ILOGN(...) logmsg(LOGLVL_INF, NULL, __func__, __LINE__, false, __VA_ARGS__) #endif -#if MIN_LOG_LEVEL <= WARN_LOG_LEVEL +#if MIN_LOG_LEVEL <= LOGLVL_WRN # undef WLOG # undef WLOGN -# define WLOG(...) logmsg(WARN_LOG_LEVEL, NULL, __func__, __LINE__, true, \ - __VA_ARGS__) -# define WLOGN(...) logmsg(WARN_LOG_LEVEL, NULL, __func__, __LINE__, false, \ - __VA_ARGS__) +# define WLOG(...) logmsg(LOGLVL_WRN, NULL, __func__, __LINE__, true, __VA_ARGS__) +# define WLOGN(...) logmsg(LOGLVL_WRN, NULL, __func__, __LINE__, false, __VA_ARGS__) #endif -#if MIN_LOG_LEVEL <= ERROR_LOG_LEVEL +#if MIN_LOG_LEVEL <= LOGLVL_ERR # undef ELOG # undef ELOGN -# define ELOG(...) logmsg(ERROR_LOG_LEVEL, NULL, __func__, __LINE__, true, \ - __VA_ARGS__) -# define ELOGN(...) logmsg(ERROR_LOG_LEVEL, NULL, __func__, __LINE__, false, \ - __VA_ARGS__) +# define ELOG(...) logmsg(LOGLVL_ERR, NULL, __func__, __LINE__, true, __VA_ARGS__) +# define ELOGN(...) logmsg(LOGLVL_ERR, NULL, __func__, __LINE__, false, __VA_ARGS__) #endif #ifdef HAVE_EXECINFO_BACKTRACE |