diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-06-27 20:05:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-27 20:05:11 -0400 |
| commit | b5d778dd828f8a772373931adaf10152f7db5854 (patch) | |
| tree | d576aeed92f5819b1e873539e6151509eeec529d | |
| parent | 8f67903909dc542c9137bd8168967ca1f788b11e (diff) | |
| parent | 26842ff3833c853e3e3cef065a494c05736a53e5 (diff) | |
Merge pull request #728 from deklov/master
Add get_log_level() to encapsulate v (current log level)
| -rw-r--r-- | common/log.c | 10 | ||||
| -rw-r--r-- | include/log.h | 1 | ||||
| -rw-r--r-- | sway/debug_log.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/common/log.c b/common/log.c index ef791bec..56c3834a 100644 --- a/common/log.c +++ b/common/log.c @@ -12,9 +12,9 @@ #include <string.h> #include <stringop.h> -int colored = 1; -log_importance_t loglevel_default = L_ERROR; -log_importance_t v = L_SILENT; +static int colored = 1; +static log_importance_t loglevel_default = L_ERROR; +static log_importance_t v = L_SILENT; static const char *verbosity_colors[] = { [L_SILENT] = "", @@ -38,6 +38,10 @@ void set_log_level(log_importance_t verbosity) { v = verbosity; } +log_importance_t get_log_level(void) { + return v; +} + void reset_log_level(void) { v = loglevel_default; } diff --git a/include/log.h b/include/log.h index efacf90f..ca8c1fe3 100644 --- a/include/log.h +++ b/include/log.h @@ -11,6 +11,7 @@ typedef enum { void init_log(log_importance_t verbosity); void set_log_level(log_importance_t verbosity); +log_importance_t get_log_level(void); void reset_log_level(void); // returns whether debug logging is on after switching. bool toggle_debug_logging(void); diff --git a/sway/debug_log.c b/sway/debug_log.c index f804a541..7c988464 100644 --- a/sway/debug_log.c +++ b/sway/debug_log.c @@ -12,8 +12,6 @@ #include <stringop.h> #include "workspace.h" -extern log_importance_t v; - /* XXX:DEBUG:XXX */ static void container_log(const swayc_t *c, int depth) { fprintf(stderr, "focus:%c", @@ -49,7 +47,7 @@ static void container_log(const swayc_t *c, int depth) { fprintf(stderr, "name:%.16s\n", c->name); } void layout_log(const swayc_t *c, int depth) { - if (L_DEBUG > v) return; + if (L_DEBUG > get_log_level()) return; int i, d; int e = c->children ? c->children->length : 0; container_log(c, depth); |