diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
| commit | d47db8d4713de42ccca071c9e8401fc7a213ed49 (patch) | |
| tree | 7189b3c025315c514ae9d2835810b94d0e4e0e01 /libX11/src/xkb/XKBGAlloc.c | |
| parent | 880395e8c3f451bf34b96da76fcee133b356e966 (diff) | |
| parent | c30d5eefc96925b4bef781806c7a0114eca1b8e0 (diff) | |
| download | vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.gz vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.bz2 vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014
Conflicts:
openssl/Makefile
Diffstat (limited to 'libX11/src/xkb/XKBGAlloc.c')
| -rw-r--r-- | libX11/src/xkb/XKBGAlloc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libX11/src/xkb/XKBGAlloc.c b/libX11/src/xkb/XKBGAlloc.c index ecac4f33c..64d47f19b 100644 --- a/libX11/src/xkb/XKBGAlloc.c +++ b/libX11/src/xkb/XKBGAlloc.c @@ -179,8 +179,7 @@ _XkbClearColor(char *color_in) { XkbColorPtr color = (XkbColorPtr) color_in; - if (color->spec) - _XkbFree(color->spec); + _XkbFree(color->spec); return; } @@ -662,8 +661,7 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value) return NULL; for (i = 0, prop = geom->properties; i < geom->num_properties; i++, prop++) { if ((prop->name) && (strcmp(name, prop->name) == 0)) { - if (prop->value) - _XkbFree(prop->value); + _XkbFree(prop->value); prop->value = strdup(value); return prop; } |