Commit 744527e9a9080368ffe21a92e6bfeb78102e68e9
2012-02-24T16:10:06
Fix remaining warnings Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index 18f41e6..bb3a891 100644
--- 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 1b98602..2a89598 100644
--- 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 24bcd6f..c82ee9f 100644
--- 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???) */