From 0cf9b03f4990f61640dc35dfac250f929b57b4ed Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 14 Jun 2010 12:29:39 +0000
Subject: xserver git update 14/6/2010

---
 xorg-server/xkb/XKBMAlloc.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'xorg-server/xkb/XKBMAlloc.c')

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));
-- 
cgit v1.2.3