sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the --debug option's argument a regex

Browse source
This commit is contained in:
John Wiegley 2012-02-28 01:37:19 -06:00
parent fc62402c60
commit d3d13329d9
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/utils.cc
View file

@ -603,7 +603,12 @@ void logger_func(log_level_t level)
namespace ledger { namespace ledger {
optional<std::string> _log_category; optional<std::string> _log_category;
#if defined(HAVE_BOOST_REGEX_UNICODE)
optional<boost::u32regex> _log_category_re;
#else
optional<boost::regex> _log_category_re;
#endif
struct __maybe_enable_debugging { struct __maybe_enable_debugging {
__maybe_enable_debugging() { __maybe_enable_debugging() {

26
src/utils.h
View file

@ -338,10 +338,32 @@ extern uint8_t _trace_level;
#if defined(DEBUG_ON) #if defined(DEBUG_ON)
extern optional<std::string> _log_category; extern optional<std::string> _log_category;
#if defined(HAVE_BOOST_REGEX_UNICODE)
extern optional<boost::u32regex> _log_category_re;
#else
extern optional<boost::regex> _log_category_re;
#endif
inline bool category_matches(const char * cat) { inline bool category_matches(const char * cat) {
return _log_category && starts_with(cat, *_log_category); if (_log_category) {
if (! _log_category_re) {
_log_category_re =
#if defined(HAVE_BOOST_REGEX_UNICODE)
boost::make_u32regex(_log_category->c_str(),
boost::regex::perl | boost::regex::icase);
#else
boost::make_regex(_log_category->c_str(),
boost::regex::perl | boost::regex::icase);
#endif
}
#if defined(HAVE_BOOST_REGEX_UNICODE)
return boost::u32regex_search(cat, *_log_category_re);
#else
return boost::regex_search(cat, *_log_category_re);
#endif
}
return false;
} }
#define SHOW_DEBUG(cat) \ #define SHOW_DEBUG(cat) \