summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-10-22 14:27:26 -0700
committerKeith Packard <keithp@keithp.com>2014-10-28 11:26:23 -0700
commitda70c7d556bbf21ad495c26e982e2e0f2d7de6c1 (patch)
tree88a1314d38099e9ec5aa4a77869243fbfd1285c5
parent2566835b4374edb3e5a8353d4f7c9e7ec4851c57 (diff)
xkb: Initialize 'bad' Atom in _XkbSetNamesCheck
When _XkbCheckAtoms returns NULL for an error, it always sets the error return code, but GCC can't figure that out, so just initialize the local variable, 'bad', in _XkbSetNamesCheck to eliminate the warning. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xkb/xkb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index dc570f0e5..fdc5923c5 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3986,7 +3986,7 @@ _XkbSetNamesCheck(ClientPtr client, DeviceIntPtr dev,
{
XkbDescRec *xkb;
CARD32 *tmp;
- Atom bad;
+ Atom bad = None;
tmp = data;
xkb = dev->key->xkbInfo->desc;