-# define _VERBOSE_(vlvl,llvl,...) do{ if (verbosity >= vlvl) verbose(llvl, __FILE__, __LINE__, __func__, __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)
+#if defined(VERBOSE_NO_DATA)
+# define __VERBOSE__(lvl,...) do{if((lvl)<=Log_Level_Error) verbose(lvl, __FILE__, __LINE__, NULL, __VA_ARGS__)\
+ else verbose(lvl, __FILE__, __LINE__, NULL, 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 _LOGMASK_(lvl) ((lvl) < 0 ? -1 : (1 << (lvl)))
+#define _WANTLOG_(lvl) (logmask & _LOGMASK_(lvl))
+#define _VERBOSE_(lvl,...) do{ if (_WANTLOG_(lvl)) __VERBOSE__((lvl), __VA_ARGS__); } while(0)
+
+#define EMERGENCY(...) _VERBOSE_(Log_Level_Emergency, __VA_ARGS__)
+#define ALERT(...) _VERBOSE_(Log_Level_Alert, __VA_ARGS__)
+#define CRITICAL(...) _VERBOSE_(Log_Level_Critical, __VA_ARGS__)
+#define ERROR(...) _VERBOSE_(Log_Level_Error, __VA_ARGS__)
+#define WARNING(...) _VERBOSE_(Log_Level_Warning, __VA_ARGS__)
+#define NOTICE(...) _VERBOSE_(Log_Level_Notice, __VA_ARGS__)
+#define INFO(...) _VERBOSE_(Log_Level_Info, __VA_ARGS__)
+#define DEBUG(...) _VERBOSE_(Log_Level_Debug, __VA_ARGS__)
+
+#define LOGUSER(app) verbose_set_name(app,0)
+#define LOGAUTH(app) verbose_set_name(app,1)