From 156e37d3879b316329e3e05579414031da2647e2 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 14 Nov 2011 09:38:56 +0100 Subject: libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update 14 nov 2011 --- xkbcomp/geometry.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xkbcomp/geometry.c') diff --git a/xkbcomp/geometry.c b/xkbcomp/geometry.c index 6d2ca7f90..7f65c3af4 100644 --- a/xkbcomp/geometry.c +++ b/xkbcomp/geometry.c @@ -366,7 +366,7 @@ InitRowInfo(RowInfo * row, SectionInfo * section, GeometryInfo * info) } else { - bzero(row, sizeof(RowInfo *)); + bzero(row, sizeof(*row)); row->defs.defined = _GR_Default; row->defs.fileID = info->fileID; row->defs.merge = info->merge; @@ -3611,11 +3611,11 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info) key->shape_ndx = 0; else { - ShapeInfo *si; - si = FindShape(info, ki->shape, "key", keyText(ki)); - if (!si) + ShapeInfo *sinfo; + sinfo = FindShape(info, ki->shape, "key", keyText(ki)); + if (!sinfo) return False; - key->shape_ndx = si->index; + key->shape_ndx = sinfo->index; } if (ki->color != None) color = -- cgit v1.2.3