diff options
author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2013-12-20 16:51:37 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-05-02 10:58:33 +0200 |
commit | 4cb9844e898e8c1ddeaf1f8bb13916639d78df20 (patch) | |
tree | b523180a3f0993b33b9a94ed8350888e65221c1e /src/util | |
parent | a59e6f8ee3a57f1161ccdf4d887db2ab69476f13 (diff) | |
download | sssd-4cb9844e898e8c1ddeaf1f8bb13916639d78df20.tar.gz sssd-4cb9844e898e8c1ddeaf1f8bb13916639d78df20.tar.xz sssd-4cb9844e898e8c1ddeaf1f8bb13916639d78df20.zip |
Remove DEBUG macro support for old debug levels
Remove support for specifying old debug levels to the DEBUG macro:
* remove debug_get_level function which was used for conversion,
* remove debug_get_level tests,
* remove mentions of old/new levels from DEBUG and DEBUG_IS_SET
macro descriptions,
* rename "newlevel" argument of debug_fn to just "level".
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
(cherry picked from commit 5c233380e1ebf641f6106a34d7b94f9e9a606589)
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/debug.c | 32 | ||||
-rw-r--r-- | src/util/util.h | 20 |
2 files changed, 9 insertions, 43 deletions
diff --git a/src/util/debug.c b/src/util/debug.c index 5d6132b88..6ac916573 100644 --- a/src/util/debug.c +++ b/src/util/debug.c @@ -129,7 +129,7 @@ static void debug_printf(const char *format, ...) va_end(ap); } -void debug_fn(const char *function, int newlevel, const char *format, ...) +void debug_fn(const char *function, int level, const char *format, ...) { va_list ap; struct timeval tv; @@ -148,15 +148,15 @@ void debug_fn(const char *function, int newlevel, const char *format, ...) debug_printf("(%s:%.6ld %d) [%s] [%s] (%#.4x): ", datetime, tv.tv_usec, year, debug_prg_name, - function, newlevel); + function, level); } else { debug_printf("(%s %d) [%s] [%s] (%#.4x): ", datetime, year, - debug_prg_name, function, newlevel); + debug_prg_name, function, level); } } else { debug_printf("[%s] [%s] (%#.4x): ", - debug_prg_name, function, newlevel); + debug_prg_name, function, level); } va_start(ap, format); @@ -165,30 +165,6 @@ void debug_fn(const char *function, int newlevel, const char *format, ...) debug_fflush(); } -int debug_get_level(int old_level) -{ - if ((old_level != 0) && !(old_level & 0x000F)) - return old_level; - - if ((old_level > 9) || (old_level < 0)) - return SSSDBG_FATAL_FAILURE; - - int levels[] = { - SSSDBG_FATAL_FAILURE, /* 0 */ - SSSDBG_CRIT_FAILURE, - SSSDBG_OP_FAILURE, - SSSDBG_MINOR_FAILURE, - SSSDBG_CONF_SETTINGS, - SSSDBG_FUNC_DATA, - SSSDBG_TRACE_FUNC, - SSSDBG_TRACE_LIBS, - SSSDBG_TRACE_INTERNAL, - SSSDBG_TRACE_ALL /* 9 */ - }; - - return levels[old_level]; -} - void ldb_debug_messages(void *context, enum ldb_debug_level level, const char *fmt, va_list ap) { diff --git a/src/util/util.h b/src/util/util.h index 1390a9e14..aeb5c78cc 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -67,9 +67,8 @@ extern int debug_timestamps; extern int debug_microseconds; extern int debug_to_file; extern const char *debug_log_file; -void debug_fn(const char *function, int newlevel, const char *format, ...) +void debug_fn(const char *function, int level, const char *format, ...) SSS_ATTRIBUTE_PRINTF(3, 4); -int debug_get_level(int old_level); int debug_convert_old_level(int old_level); errno_t set_debug_file_from_fd(const int fd); @@ -110,27 +109,18 @@ errno_t set_debug_file_from_fd(const int fd); \brief macro to generate debug messages \param level the debug level, please use one of the SSSDBG_* macros - Old format: - - 1 is for critical errors users may find it difficult to understand but - are still quite clear - - 2-4 is for stuff developers are interested in in general, but - shouldn't fill the screen with useless low level verbose stuff - - 5-6 is for errors you may want to track, but only if you explicitly - looking for additional clues - - 7-10 is for informational stuff - \param format the debug message format string, should result in a newline-terminated message \param ... the debug message format arguments */ #define DEBUG(level, format, ...) do { \ - int __debug_macro_newlevel = debug_get_level(level); \ - if (DEBUG_IS_SET(__debug_macro_newlevel)) \ - debug_fn(__FUNCTION__, __debug_macro_newlevel, format, ##__VA_ARGS__); \ + int __debug_macro_level = level; \ + if (DEBUG_IS_SET(__debug_macro_level)) \ + debug_fn(__FUNCTION__, __debug_macro_level, format, ##__VA_ARGS__); \ } while (0) /** \def DEBUG_IS_SET(level) - \brief checks whether level (must be in new format) is set in debug_level + \brief checks whether level is set in debug_level \param level the debug level, please use one of the SSSDBG*_ macros */ |