/*
- * Copyright © 2012 Ran Benita
+ * Copyright © 2012 Ran Benita <ran234@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* DEALINGS IN THE SOFTWARE.
*/
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "config.h"
#include "test.h"
-#include "xkb-priv.h"
+#include "context.h"
+#ifdef __GNUC__
#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
+#endif
static const char *
log_level_to_string(enum xkb_log_level level)
{
char *s;
int size;
- darray_char *ls = xkb_get_user_data(ctx);
+ darray_char *ls = xkb_context_get_user_data(ctx);
assert(ls);
size = vasprintf(&s, fmt, args);
struct xkb_context *ctx;
int ret;
- ret = setenv("XKB_LOG", "warn", 1);
+ ret = setenv("XKB_LOG_LEVEL", "warn", 1);
assert(ret == 0);
- ret = setenv("XKB_VERBOSITY", "5", 1);
+ ret = setenv("XKB_LOG_VERBOSITY", "5", 1);
assert(ret == 0);
- ctx = xkb_context_new(0);
+ ctx = test_get_context(0);
assert(ctx);
darray_init(log_string);
- xkb_set_user_data(ctx, &log_string);
- xkb_set_log_fn(ctx, log_fn);
+ xkb_context_set_user_data(ctx, &log_string);
+ xkb_context_set_log_fn(ctx, log_fn);
log_warn(ctx, "first warning: %d\n", 87);
log_info(ctx, "first info\n");
log_err(ctx, "first error: %lu\n", 115415UL);
log_vrb(ctx, 5, "first verbose 5\n");
- xkb_set_log_level(ctx, XKB_LOG_LEVEL_DEBUG);
+ xkb_context_set_log_level(ctx, XKB_LOG_LEVEL_DEBUG);
log_warn(ctx, "second warning: %d\n", 87);
log_dbg(ctx, "second debug: %s %s\n", "hello", "world");
log_info(ctx, "second info\n");
log_err(ctx, "second error: %lu\n", 115415UL);
log_vrb(ctx, 6, "second verbose 6\n");
- xkb_set_log_verbosity(ctx, 0);
- xkb_set_log_level(ctx, XKB_LOG_LEVEL_CRITICAL);
+ xkb_context_set_log_verbosity(ctx, 0);
+ xkb_context_set_log_level(ctx, XKB_LOG_LEVEL_CRITICAL);
log_warn(ctx, "third warning: %d\n", 87);
log_dbg(ctx, "third debug: %s %s\n", "hello", "world");
log_info(ctx, "third info\n");