diff options
author | Ran Benita <ran234@gmail.com> | 2014-01-12 14:37:39 +0200 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2014-01-12 14:37:39 +0200 |
commit | 917c751523598e82002d69e241763b02dac3cf04 (patch) | |
tree | d487da17166d9e136e596493240b3a8683839790 /src | |
parent | 101720a2bc106288d6ca2c2ceb5bec41742b8d8d (diff) | |
download | xorg-lib-libxkbcommon-917c751523598e82002d69e241763b02dac3cf04.tar.gz |
context: remove mostly useless log wrappers
Just use xkb_log directly.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/context.c | 5 | ||||
-rw-r--r-- | src/context.h | 26 | ||||
-rw-r--r-- | src/xkbcomp/scanner.c | 4 |
3 files changed, 14 insertions, 21 deletions
diff --git a/src/context.c b/src/context.c index 6ecc4b3..3c0cab4 100644 --- a/src/context.c +++ b/src/context.c @@ -352,11 +352,14 @@ xkb_atom_text(struct xkb_context *ctx, xkb_atom_t atom) } void -xkb_log(struct xkb_context *ctx, enum xkb_log_level level, +xkb_log(struct xkb_context *ctx, enum xkb_log_level level, int verbosity, const char *fmt, ...) { va_list args; + if (ctx->log_level < level || ctx->log_verbosity < verbosity) + return; + va_start(args, fmt); ctx->log_fn(ctx, level, fmt, args); va_end(args); diff --git a/src/context.h b/src/context.h index 67e68d9..580acba 100644 --- a/src/context.h +++ b/src/context.h @@ -63,20 +63,10 @@ xkb_atom_text(struct xkb_context *ctx, xkb_atom_t atom); char * xkb_context_get_buffer(struct xkb_context *ctx, size_t size); -ATTR_PRINTF(3, 4) void -xkb_log(struct xkb_context *ctx, enum xkb_log_level level, +ATTR_PRINTF(4, 5) void +xkb_log(struct xkb_context *ctx, enum xkb_log_level level, int verbosity, const char *fmt, ...); -#define xkb_log_cond_level(ctx, level, ...) do { \ - if (xkb_context_get_log_level(ctx) >= (level)) \ - xkb_log((ctx), (level), __VA_ARGS__); \ -} while (0) - -#define xkb_log_cond_verbosity(ctx, level, vrb, ...) do { \ - if (xkb_context_get_log_verbosity(ctx) >= (vrb)) \ - xkb_log_cond_level((ctx), (level), __VA_ARGS__); \ -} while (0) - const char * xkb_context_get_default_rules(struct xkb_context *ctx); @@ -99,17 +89,17 @@ xkb_context_get_default_options(struct xkb_context *ctx); * result in an error, though. */ #define log_dbg(ctx, ...) \ - xkb_log_cond_level((ctx), XKB_LOG_LEVEL_DEBUG, __VA_ARGS__) + xkb_log((ctx), XKB_LOG_LEVEL_DEBUG, 0, __VA_ARGS__) #define log_info(ctx, ...) \ - xkb_log_cond_level((ctx), XKB_LOG_LEVEL_INFO, __VA_ARGS__) + xkb_log((ctx), XKB_LOG_LEVEL_INFO, 0, __VA_ARGS__) #define log_warn(ctx, ...) \ - xkb_log_cond_level((ctx), XKB_LOG_LEVEL_WARNING, __VA_ARGS__) + xkb_log((ctx), XKB_LOG_LEVEL_WARNING, 0, __VA_ARGS__) #define log_err(ctx, ...) \ - xkb_log_cond_level((ctx), XKB_LOG_LEVEL_ERROR, __VA_ARGS__) + xkb_log((ctx), XKB_LOG_LEVEL_ERROR, 0, __VA_ARGS__) #define log_wsgo(ctx, ...) \ - xkb_log_cond_level((ctx), XKB_LOG_LEVEL_CRITICAL, __VA_ARGS__) + xkb_log((ctx), XKB_LOG_LEVEL_CRITICAL, 0, __VA_ARGS__) #define log_vrb(ctx, vrb, ...) \ - xkb_log_cond_verbosity((ctx), XKB_LOG_LEVEL_WARNING, (vrb), __VA_ARGS__) + xkb_log((ctx), XKB_LOG_LEVEL_WARNING, (vrb), __VA_ARGS__) /* * Variants which are prefixed by the name of the function they're diff --git a/src/xkbcomp/scanner.c b/src/xkbcomp/scanner.c index 591f1f5..48df488 100644 --- a/src/xkbcomp/scanner.c +++ b/src/xkbcomp/scanner.c @@ -28,8 +28,8 @@ static void scanner_log(enum xkb_log_level level, struct scanner *s, const char *msg) { - xkb_log_cond_level(s->ctx, level, "%s:%d:%d: %s\n", s->file_name, - s->token_line, s->token_column, msg); + xkb_log(s->ctx, level, 0, "%s:%d:%d: %s\n", s->file_name, + s->token_line, s->token_column, msg); } int |