diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 12:29:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 12:29:39 +0000 |
| commit | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (patch) | |
| tree | f4a96a254237696f58d46c150c12f289e5a15701 /xorg-server/xkb/XKBMAlloc.c | |
| parent | ea5824c767121c3c97f587a9dfb63a87b442032b (diff) | |
| download | vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.gz vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.bz2 vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.zip | |
xserver git update 14/6/2010
Diffstat (limited to 'xorg-server/xkb/XKBMAlloc.c')
| -rw-r--r-- | xorg-server/xkb/XKBMAlloc.c | 18 |
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));
|