From 89caf5edcc99f5731e89bd51e6ffaad3ec11c304 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Wed, 3 Aug 2011 09:15:52 +0200 Subject: New DEBUG facility - SSSDBG_UNRESOLVED changed from -1 to 0 Removed: SSS_UNRESOLVED_DEBUG_LEVEL (completely replaced with SSSDBG_UNRESOLVED) Added new macro: CONVERT_AND_SET_DEBUG_LEVEL(new_value) Changes unresolved debug level value (SSSDBG_UNRESOLVED) from -1 to 0 so DEBUG macro could be reduced by one condition. Anyway, it has a minor effect, every time you want to load debug_level from command line parameters, you have to use following pattern: /* Set debug level to invalid value so we can deside if -d 0 was used. */ debug_level = SSSDBG_INVALID; pc = poptGetContext(argv[0], argc, argv, long_options, 0); while((opt = poptGetNextOpt(pc)) != -1) { ... } CONVERT_AND_SET_DEBUG_LEVEL(debug_level); --- src/util/debug.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/util/debug.c') diff --git a/src/util/debug.c b/src/util/debug.c index e7ae83860..3a1b7ca2b 100644 --- a/src/util/debug.c +++ b/src/util/debug.c @@ -35,7 +35,6 @@ const char *debug_prg_name = "sssd"; int debug_level = SSSDBG_UNRESOLVED; int debug_timestamps = SSSDBG_TIMESTAMP_UNRESOLVED; - int debug_to_file = 0; const char *debug_log_file = "sssd"; FILE *debug_file = NULL; @@ -63,12 +62,9 @@ int debug_convert_old_level(int old_level) if ((old_level != 0) && !(old_level & 0x000F)) return old_level; - if( old_level == SSS_UNRESOLVED_DEBUG_LEVEL ) - return SSSDBG_UNRESOLVED; - int new_level = SSSDBG_FATAL_FAILURE; - if (old_level == 0) + if (old_level <= 0) return new_level; if (old_level >= 1) @@ -118,9 +114,6 @@ int debug_get_level(int old_level) if ((old_level != 0) && !(old_level & 0x000F)) return old_level; - if( old_level == SSS_UNRESOLVED_DEBUG_LEVEL ) - return SSSDBG_UNRESOLVED; - if ((old_level > 9) || (old_level < 0)) return SSSDBG_FATAL_FAILURE; -- cgit