summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-10-18 22:55:17 +0200
committerRan Benita <ran234@gmail.com>2012-10-18 22:55:17 +0200
commite6946ae2c59a878e838fe777b50dad695b63e6bb (patch)
treeba44a8001fa341bdb097db03d292db9f309836d1
parent714e95e1445ab0d37b3970bebdd9af09d7eaf923 (diff)
Remove a couple more uses of static char buffers
Signed-off-by: Ran Benita <ran234@gmail.com>
-rw-r--r--src/text.c6
-rw-r--r--src/xkbcomp/compat.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/src/text.c b/src/text.c
index 39fa83e..2d5cefb 100644
--- a/src/text.c
+++ b/src/text.c
@@ -288,10 +288,8 @@ ActionTypeText(unsigned type)
const char *
KeysymText(struct xkb_context *ctx, xkb_keysym_t sym)
{
- static char buffer[64];
-
- xkb_keysym_get_name(sym, buffer, sizeof buffer);
-
+ char *buffer = xkb_context_get_buffer(ctx, 64);
+ xkb_keysym_get_name(sym, buffer, 64);
return buffer;
}
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 9aca92f..fb654a6 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -271,15 +271,16 @@ typedef struct {
static const char *
siText(SymInterpInfo *si, CompatInfo *info)
{
- static char buf[128];
+ char *buf = xkb_context_get_buffer(info->keymap->ctx, 128);
if (si == &info->dflt)
return "default";
- snprintf(buf, sizeof(buf), "%s+%s(%s)",
+ snprintf(buf, 128, "%s+%s(%s)",
KeysymText(info->keymap->ctx, si->interp.sym),
SIMatchText(si->interp.match),
ModMaskText(info->keymap, si->interp.mods));
+
return buf;
}