Fix remaining warnings

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index 18f41e6d359687cbb64d08731365cb9160af52ff..bb3a891d22d10a5f805332a37567d1b7b23f1de0 100644 (file)
--- a/src/xkbcomp/geometry.c
+++ b/src/xkbcomp/geometry.c
@@ -3592,11 +3592,11 @@ CopySectionDef(struct xkb_geometry * geom, SectionInfo * si, GeometryInfo * info
                 key->shape_ndx = 0;
             else
             {
-                ShapeInfo *si;
-                si = FindShape(info, ki->shape, "key", keyText(ki));
-                if (!si)
+                ShapeInfo *shapei;
+                shapei = FindShape(info, ki->shape, "key", keyText(ki));
+                if (!shapei)
                     return False;
-                key->shape_ndx = si->index;
+                key->shape_ndx = shapei->index;
             }
             if (ki->color != None)
                 color =

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 1b9860238ff4eb030f0a762b85c6e8388360bc3d..2a895988bc96eb6145c3bdd9361f95825d154ae2 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -1678,7 +1678,7 @@ FindKeyForSymbol(struct xkb_desc * xkb, uint32_t sym, xkb_keycode_t *kc_rtrn)
             if (j < (int) XkbKeyNumSyms(xkb, i))
             {
                 gotOne = True;
-                if ((XkbKeySym(xkb, i, j) == sym))
+                if (XkbKeySym(xkb, i, j) == sym)
                 {
                     *kc_rtrn = i;
                     return True;

diff --git a/src/xkbcomp/utils.h b/src/xkbcomp/utils.h
index 24bcd6f688c49164e05355f23f7bd814d487c110..c82ee9f9b8d8cb0fb40803e1cfe3ea0814f20e92 100644 (file)
--- a/src/xkbcomp/utils.h
+++ b/src/xkbcomp/utils.h
@@ -114,7 +114,7 @@ uError(const char *s, ...);
 
 #define FATAL                  uFatalError
 
-extern __ATTR_PRINTF(1, 2) void
+extern __ATTR_PRINTF(1, 2) _X_NORETURN void
 uFatalError(const char *s, ...);
 
 /* WSGO stands for "Weird Stuff Going On" (wtf???) */