diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-05-15 06:11:33 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-05-15 06:11:33 +0000 |
| commit | 676fa23e3c5ddf19cef1f95ba5a59f47c3fc3738 (patch) | |
| tree | ac546aee33f6a7b0c55e7ad7cee1eebcd9b419d4 /app/xkbcomp/geometry.c | |
| parent | 96294d9b335dc8468dcd1f08f925f55ddcd6c2ba (diff) | |
Update to xkbcomp 1.2.4
Diffstat (limited to 'app/xkbcomp/geometry.c')
| -rw-r--r-- | app/xkbcomp/geometry.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/xkbcomp/geometry.c b/app/xkbcomp/geometry.c index 6d2ca7f90..7f65c3af4 100644 --- a/app/xkbcomp/geometry.c +++ b/app/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 = |