From c30d5eefc96925b4bef781806c7a0114eca1b8e0 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 26 Jun 2014 09:30:29 +0200 Subject: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 xserver commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37 libxcb commit 125135452a554e89e49448e2c1ee6658324e1095 libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38 xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca libX11 commit a4679baaa18142576d42d423afe816447f08336c fontconfig commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1 mesa commit 9a8acafa47558cafeb37f80f4b30061ac1962c69 --- libX11/src/xkb/XKBAlloc.c | 3 +- libX11/src/xkb/XKBExtDev.c | 6 +-- libX11/src/xkb/XKBGAlloc.c | 6 +-- libX11/src/xkb/XKBGeom.c | 11 +++--- libX11/src/xkb/XKBMAlloc.c | 92 +++++++++++++++++++--------------------------- libX11/src/xkb/XKBNames.c | 4 +- libX11/src/xkb/XKBRdBuf.c | 4 +- 7 files changed, 53 insertions(+), 73 deletions(-) (limited to 'libX11/src/xkb') diff --git a/libX11/src/xkb/XKBAlloc.c b/libX11/src/xkb/XKBAlloc.c index 5cfef0fb8..50a5764d6 100644 --- a/libX11/src/xkb/XKBAlloc.c +++ b/libX11/src/xkb/XKBAlloc.c @@ -442,8 +442,7 @@ XkbAllocDeviceInfo(unsigned deviceSpec, unsigned nButtons, unsigned szLeds) devi->sz_leds = szLeds; devi->leds = _XkbTypedCalloc(szLeds, XkbDeviceLedInfoRec); if (!devi->leds) { - if (devi->btn_acts) - _XkbFree(devi->btn_acts); + _XkbFree(devi->btn_acts); _XkbFree(devi); return NULL; } diff --git a/libX11/src/xkb/XKBExtDev.c b/libX11/src/xkb/XKBExtDev.c index 4065dcd0e..b9710f86b 100644 --- a/libX11/src/xkb/XKBExtDev.c +++ b/libX11/src/xkb/XKBExtDev.c @@ -194,8 +194,8 @@ _XkbReadGetDeviceInfoReply(Display *dpy, act = &devi->btn_acts[rep->firstBtnWanted]; bzero((char *) act, (rep->nBtnsWanted * sizeof(XkbAction))); } - if (devi->name != NULL) - _XkbFree(devi->name); + + _XkbFree(devi->name); if (!_XkbGetReadBufferCountedString(&buf, &devi->name)) goto BAILOUT; if (rep->nBtnsRtrn > 0) { @@ -475,7 +475,7 @@ _InitLedStuff(SetLedStuff *stuff, unsigned wanted, XkbDeviceInfoPtr devi) static void _FreeLedStuff(SetLedStuff * stuff) { - if ((stuff->num_info > 0) && (stuff->info != NULL)) + if (stuff->num_info > 0) _XkbFree(stuff->info); bzero(stuff, sizeof(SetLedStuff)); return; diff --git a/libX11/src/xkb/XKBGAlloc.c b/libX11/src/xkb/XKBGAlloc.c index 63bb2db38..6326c8d48 100644 --- a/libX11/src/xkb/XKBGAlloc.c +++ b/libX11/src/xkb/XKBGAlloc.c @@ -177,8 +177,7 @@ _XkbClearColor(char *color_in) { XkbColorPtr color = (XkbColorPtr) color_in; - if (color->spec) - _XkbFree(color->spec); + _XkbFree(color->spec); return; } @@ -660,8 +659,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; } diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c index feaaab6f8..66dca9ee0 100644 --- a/libX11/src/xkb/XKBGeom.c +++ b/libX11/src/xkb/XKBGeom.c @@ -269,10 +269,9 @@ _XkbReadGeomProperties(XkbReadBufferPtr buf, ok = _XkbGetReadBufferCountedString(buf, &name) && ok; ok = _XkbGetReadBufferCountedString(buf, &value) && ok; ok = ok && (XkbAddGeomProperty(geom, name, value) != NULL); - if (name) - _XkbFree(name); - if (value) - _XkbFree(value); + + _XkbFree(name); + _XkbFree(value); } if (ok) rtrn = Success; @@ -322,8 +321,8 @@ _XkbReadGeomColors(XkbReadBufferPtr buf, rtrn = BadLength; else if (XkbAddGeomColor(geom, spec, geom->num_colors) == NULL) rtrn = BadAlloc; - if (spec) - _XkbFree(spec); + + _XkbFree(spec); if (rtrn != Success) return rtrn; } diff --git a/libX11/src/xkb/XKBMAlloc.c b/libX11/src/xkb/XKBMAlloc.c index f27fe4ec3..0b86aa1d5 100644 --- a/libX11/src/xkb/XKBMAlloc.c +++ b/libX11/src/xkb/XKBMAlloc.c @@ -226,18 +226,16 @@ XkbCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into) { if ((!from) || (!into)) return BadMatch; - if (into->map) { - _XkbFree(into->map); - into->map = NULL; - } - if (into->preserve) { - _XkbFree(into->preserve); - into->preserve = NULL; - } - if (into->level_names) { - _XkbFree(into->level_names); - into->level_names = NULL; - } + + _XkbFree(into->map); + into->map = NULL; + + _XkbFree(into->preserve); + into->preserve = NULL; + + _XkbFree(into->level_names); + into->level_names = NULL; + *into = *from; if ((from->map) && (into->map_count > 0)) { into->map = _XkbTypedCalloc(into->map_count, XkbKTMapEntryRec); @@ -385,11 +383,9 @@ XkbResizeKeyType(XkbDescPtr xkb, } type = &xkb->map->types[type_ndx]; if (map_count == 0) { - if (type->map != NULL) - _XkbFree(type->map); + _XkbFree(type->map); type->map = NULL; - if (type->preserve != NULL) - _XkbFree(type->preserve); + _XkbFree(type->preserve); type->preserve = NULL; type->map_count = 0; } @@ -400,8 +396,7 @@ XkbResizeKeyType(XkbDescPtr xkb, type->map = _XkbTypedRealloc(type->map, map_count, XkbKTMapEntryRec); if (!type->map) { - if (prev_map) - _XkbFree(prev_map); + _XkbFree(prev_map); return BadAlloc; } if (want_preserve) { @@ -412,12 +407,11 @@ XkbResizeKeyType(XkbDescPtr xkb, XkbModsRec); } if (!type->preserve) { - if (prev_preserve) - _XkbFree(prev_preserve); + _XkbFree(prev_preserve); return BadAlloc; } } - else if (type->preserve != NULL) { + else { _XkbFree(type->preserve); type->preserve = NULL; } @@ -430,8 +424,7 @@ XkbResizeKeyType(XkbDescPtr xkb, type->level_names = _XkbTypedRealloc(type->level_names, new_num_lvls, Atom); if (!type->level_names) { - if (prev_level_names) - _XkbFree(prev_level_names); + _XkbFree(prev_level_names); return BadAlloc; } } @@ -919,19 +912,16 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap) XkbKeyTypePtr type; for (i = 0, type = map->types; i < map->num_types; i++, type++) { - if (type->map != NULL) { - _XkbFree(type->map); - type->map = NULL; - } - if (type->preserve != NULL) { - _XkbFree(type->preserve); - type->preserve = NULL; - } + _XkbFree(type->map); + type->map = NULL; + + _XkbFree(type->preserve); + type->preserve = NULL; + type->map_count = 0; - if (type->level_names != NULL) { - _XkbFree(type->level_names); - type->level_names = NULL; - } + + _XkbFree(type->level_names); + type->level_names = NULL; } } _XkbFree(map->types); @@ -940,17 +930,14 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap) } } if (what & XkbKeySymsMask) { - if (map->key_sym_map != NULL) { - _XkbFree(map->key_sym_map); - map->key_sym_map = NULL; - } - if (map->syms != NULL) { - _XkbFree(map->syms); - map->size_syms = map->num_syms = 0; - map->syms = NULL; - } + _XkbFree(map->key_sym_map); + map->key_sym_map = NULL; + + _XkbFree(map->syms); + map->size_syms = map->num_syms = 0; + map->syms = NULL; } - if ((what & XkbModifierMapMask) && (map->modmap != NULL)) { + if (what & XkbModifierMapMask) { _XkbFree(map->modmap); map->modmap = NULL; } @@ -971,26 +958,23 @@ XkbFreeServerMap(XkbDescPtr xkb, unsigned what, Bool freeMap) if (freeMap) what = XkbAllServerInfoMask; map = xkb->server; - if ((what & XkbExplicitComponentsMask) && (map->explicit != NULL)) { + if (what & XkbExplicitComponentsMask) { _XkbFree(map->explicit); map->explicit = NULL; } if (what & XkbKeyActionsMask) { - if (map->key_acts != NULL) { - _XkbFree(map->key_acts); + _XkbFree(map->key_acts); map->key_acts = NULL; - } - if (map->acts != NULL) { - _XkbFree(map->acts); + + _XkbFree(map->acts); map->num_acts = map->size_acts = 0; map->acts = NULL; - } } - if ((what & XkbKeyBehaviorsMask) && (map->behaviors != NULL)) { + if (what & XkbKeyBehaviorsMask) { _XkbFree(map->behaviors); map->behaviors = NULL; } - if ((what & XkbVirtualModMapMask) && (map->vmodmap != NULL)) { + if (what & XkbVirtualModMapMask) { _XkbFree(map->vmodmap); map->vmodmap = NULL; } diff --git a/libX11/src/xkb/XKBNames.c b/libX11/src/xkb/XKBNames.c index 5a3fb6f8d..6c4800c29 100644 --- a/libX11/src/xkb/XKBNames.c +++ b/libX11/src/xkb/XKBNames.c @@ -133,8 +133,8 @@ _XkbReadGetNamesReply(Display *dpy, if ((nLevels[i] > 0) && (nLevels[i] != type->num_levels)) { goto BAILOUT; } - if (type->level_names != NULL) - Xfree(type->level_names); + + Xfree(type->level_names); if (nLevels[i] == 0) { type->level_names = NULL; continue; diff --git a/libX11/src/xkb/XKBRdBuf.c b/libX11/src/xkb/XKBRdBuf.c index 8e9eab238..0a29bdca4 100644 --- a/libX11/src/xkb/XKBRdBuf.c +++ b/libX11/src/xkb/XKBRdBuf.c @@ -167,8 +167,8 @@ _XkbFreeReadBuffer(XkbReadBufferPtr buf) int left; left = (int) _XkbReadBufferDataLeft(buf); - if (buf->start != NULL) - Xfree(buf->start); + + Xfree(buf->start); buf->size = 0; buf->start = buf->data = NULL; return left; -- cgit v1.2.3