aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/XKBMAlloc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
committermarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
commite2eb44705a8e4886d81b75c12e68aaebe9946439 (patch)
tree00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/xkb/XKBMAlloc.c
parent2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff)
parent0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff)
downloadvcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/XKBMAlloc.c')
-rw-r--r--xorg-server/xkb/XKBMAlloc.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/xorg-server/xkb/XKBMAlloc.c b/xorg-server/xkb/XKBMAlloc.c
index 0bd7b5e01..28995de81 100644
--- a/xorg-server/xkb/XKBMAlloc.c
+++ b/xorg-server/xkb/XKBMAlloc.c
@@ -221,18 +221,12 @@ XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
{
if ((!from)||(!into))
return BadMatch;
- if (into->map) {
- free(into->map);
- into->map= NULL;
- }
- if (into->preserve) {
- free(into->preserve);
- into->preserve= NULL;
- }
- if (into->level_names) {
- free(into->level_names);
- into->level_names= NULL;
- }
+ free(into->map);
+ into->map = NULL;
+ free(into->preserve);
+ into->preserve = NULL;
+ free(into->level_names);
+ into->level_names = NULL;
*into= *from;
if ((from->map)&&(into->map_count>0)) {
into->map= calloc(into->map_count, sizeof(XkbKTMapEntryRec));