----------------+------------------------
lesser than 0 : no message at all
0 : ERROR
- 1 : ERROR, WARNING, NOTICE
- 2 : ERROR, WARNING, NOTICE, INFO
- greater than 2 : ERROR, WARNING, NOTICE, INFO, DEBUG
+ 1 : ERROR, WARNING
+ 2 : ERROR, WARNING, NOTICE
+ 3 : ERROR, WARNING, NOTICE, INFO
+ greater than 3 : ERROR, WARNING, NOTICE, INFO, DEBUG
*/
extern int verbosity;
{
Verbosity_Level_Error = 0,
Verbosity_Level_Warning = 1,
- Verbosity_Level_Notice = 1,
- Verbosity_Level_Info = 2,
- Verbosity_Level_Debug = 3
+ Verbosity_Level_Notice = 2,
+ Verbosity_Level_Info = 3,
+ Verbosity_Level_Debug = 4
};
extern void verbose_set_name(const char *name, int authority);
extern void verbose(int loglevel, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
extern void vverbose(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args);
-# define _VERBOSE_(vlvl,llvl,...) do{ if (verbosity >= vlvl) verbose(llvl, __FILE__, __LINE__, __func__, __VA_ARGS__); } while(0)
+#if defined(VERBOSE_NO_DATA)
+# define __VERBOSE__(lvl,...) do{if((lvl)<=Log_Level_Error) verbose(lvl, __FILE__, __LINE__, __func__, __VA_ARGS__)\
+ else verbose(lvl, __FILE__, __LINE__, __func__, NULL);}while(0)
+#elif defined(VERBOSE_NO_DETAILS)
+# define __VERBOSE__(lvl,...) verbose(lvl, NULL, 0, NULL, __VA_ARGS__)
+#else
+# define __VERBOSE__(lvl,...) verbose(lvl, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#endif
+
+# define _VERBOSE_(vlvl,llvl,...) do{ if (verbosity >= vlvl) __VERBOSE__(llvl, __VA_ARGS__); } while(0)
+
# define ERROR(...) _VERBOSE_(Verbosity_Level_Error, Log_Level_Error, __VA_ARGS__)
# define WARNING(...) _VERBOSE_(Verbosity_Level_Warning, Log_Level_Warning, __VA_ARGS__)
# define NOTICE(...) _VERBOSE_(Verbosity_Level_Notice, Log_Level_Notice, __VA_ARGS__)
# define INFO(...) _VERBOSE_(Verbosity_Level_Info, Log_Level_Info, __VA_ARGS__)
# define DEBUG(...) _VERBOSE_(Verbosity_Level_Debug, Log_Level_Debug, __VA_ARGS__)
+
# define LOGUSER(app) verbose_set_name(app,0)
# define LOGAUTH(app) verbose_set_name(app,1)