aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp
diff options
context:
space:
mode:
Diffstat (limited to 'xkbcomp')
-rw-r--r--xkbcomp/geometry.c1
-rw-r--r--xkbcomp/keycodes.c2
-rw-r--r--xkbcomp/keytypes.c2
-rw-r--r--xkbcomp/listing.c2
-rw-r--r--xkbcomp/parseutils.c6
5 files changed, 5 insertions, 8 deletions
diff --git a/xkbcomp/geometry.c b/xkbcomp/geometry.c
index 2daa213ac..5d653160e 100644
--- a/xkbcomp/geometry.c
+++ b/xkbcomp/geometry.c
@@ -2423,7 +2423,6 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
ol->points, info);
continue;
}
- outline = NULL;
outline = &si->outlines[nOut++];
outline->num_points = ol->nPoints;
outline->corner_radius = si->dfltCornerRadius;
diff --git a/xkbcomp/keycodes.c b/xkbcomp/keycodes.c
index 4081ea1b5..57c8bc892 100644
--- a/xkbcomp/keycodes.c
+++ b/xkbcomp/keycodes.c
@@ -261,7 +261,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
new = NextIndicatorName(info);
if (!new)
{
- WSGO1("Couldn't allocate name for indicator %d\n", new->ndx);
+ WSGO1("Couldn't allocate name for indicator %d\n", old->ndx);
ACTION("Ignored\n");
return False;
}
diff --git a/xkbcomp/keytypes.c b/xkbcomp/keytypes.c
index 375ca3e0d..103d86074 100644
--- a/xkbcomp/keytypes.c
+++ b/xkbcomp/keytypes.c
@@ -597,7 +597,7 @@ AddPreserve(XkbDescPtr xkb,
if (!old)
{
WSGO1("Couldn't allocate preserve in %s\n", TypeTxt(type));
- ACTION1("Preserve[%s] lost\n", PreserveIndexTxt(type, xkb, old));
+ ACTION1("Preserve[%s] lost\n", PreserveIndexTxt(type, xkb, new));
return False;
}
*old = *new;
diff --git a/xkbcomp/listing.c b/xkbcomp/listing.c
index 86c1dfb8b..2860ec728 100644
--- a/xkbcomp/listing.c
+++ b/xkbcomp/listing.c
@@ -302,8 +302,8 @@ AddDirectory(char *head, char *ptrn, char *rest, char *map)
#else
if ((dirp = opendir((head ? head : "."))) == NULL)
return 0;
- nMatch = 0;
#endif
+ nMatch = 0;
#ifdef WIN32
do
#else
diff --git a/xkbcomp/parseutils.c b/xkbcomp/parseutils.c
index 4b2a3e605..ab50c5710 100644
--- a/xkbcomp/parseutils.c
+++ b/xkbcomp/parseutils.c
@@ -561,10 +561,8 @@ OverlayKeyCreate(char *under, char *over)
key->common.stmtType = StmtOverlayKeyDef;
strncpy(key->over, over, XkbKeyNameLength);
strncpy(key->under, under, XkbKeyNameLength);
- if (over)
- uFree(over);
- if (under)
- uFree(under);
+ uFree(over);
+ uFree(under);
}
return key;
}