diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
| commit | e2eb44705a8e4886d81b75c12e68aaebe9946439 (patch) | |
| tree | 00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/xkb/XKBGAlloc.c | |
| parent | 2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff) | |
| parent | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff) | |
| download | vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2 vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/XKBGAlloc.c')
| -rw-r--r-- | xorg-server/xkb/XKBGAlloc.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/xorg-server/xkb/XKBGAlloc.c b/xorg-server/xkb/XKBGAlloc.c index b5c9b8446..a6d10c4b0 100644 --- a/xorg-server/xkb/XKBGAlloc.c +++ b/xorg-server/xkb/XKBGAlloc.c @@ -114,10 +114,8 @@ register char *ptr; }
if (freeAll) {
(*num_inout)= (*sz_inout)= 0;
- if (*elems) {
- free(*elems);
- *elems= NULL;
- }
+ free(*elems);
+ *elems = NULL;
}
else if (first+count>=(*num_inout))
*num_inout= first;
@@ -137,14 +135,10 @@ _XkbClearProperty(char *prop_in) {
XkbPropertyPtr prop= (XkbPropertyPtr)prop_in;
- if (prop->name) {
- free(prop->name);
- prop->name= NULL;
- }
- if (prop->value) {
- free(prop->value);
- prop->value= NULL;
- }
+ free(prop->name);
+ prop->name = NULL;
+ free(prop->value);
+ prop->value = NULL;
return;
}
|