Skip to content

N
nx-libs
Commit dd6dc2dd authored by walter harms's avatar walter harms Committed by Ulrich Sibiller
Browse files
Options

rm redundant null checks

remove more redundant NULL checks note that _XkbFree() is really Xfree() Signed-off-by: 's avatarHarms <wharms@bfs,de> Reviewed-by: 's avatarRémi Cardona <remi@gentoo.org> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent a9826072
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 70 deletions
nx-X11/lib/X11/GetHints.c
View file @ dd6dc2dd
...@@ -258,7 +258,7 @@ Status XGetCommand ( ...@@ -258,7 +258,7 @@ Status XGetCommand (
return (0); return (0);
} }
if (tp.value) Xfree (tp.value); Xfree (tp.value);
*argvp = argv; *argvp = argv;
*argcp = argc; *argcp = argc;
return 1; return 1;
......
nx-X11/lib/X11/XKBAlloc.c
View file @ dd6dc2dd
...@@ -442,8 +442,7 @@ XkbAllocDeviceInfo(unsigned deviceSpec, unsigned nButtons, unsigned szLeds) ...@@ -442,8 +442,7 @@ XkbAllocDeviceInfo(unsigned deviceSpec, unsigned nButtons, unsigned szLeds)
devi->sz_leds = szLeds; devi->sz_leds = szLeds;
devi->leds = _XkbTypedCalloc(szLeds, XkbDeviceLedInfoRec); devi->leds = _XkbTypedCalloc(szLeds, XkbDeviceLedInfoRec);
if (!devi->leds) { if (!devi->leds) {
if (devi->btn_acts) _XkbFree(devi->btn_acts);
_XkbFree(devi->btn_acts);
_XkbFree(devi); _XkbFree(devi);
return NULL; return NULL;
} }
......
nx-X11/lib/X11/XKBExtDev.c
View file @ dd6dc2dd
...@@ -194,8 +194,8 @@ _XkbReadGetDeviceInfoReply(Display *dpy, ...@@ -194,8 +194,8 @@ _XkbReadGetDeviceInfoReply(Display *dpy,
act = &devi->btn_acts[rep->firstBtnWanted]; act = &devi->btn_acts[rep->firstBtnWanted];
bzero((char *) act, (rep->nBtnsWanted * sizeof(XkbAction))); bzero((char *) act, (rep->nBtnsWanted * sizeof(XkbAction)));
} }
if (devi->name != NULL)
_XkbFree(devi->name); _XkbFree(devi->name);
if (!_XkbGetReadBufferCountedString(&buf, &devi->name)) if (!_XkbGetReadBufferCountedString(&buf, &devi->name))
goto BAILOUT; goto BAILOUT;
if (rep->nBtnsRtrn > 0) { if (rep->nBtnsRtrn > 0) {
...@@ -475,7 +475,7 @@ _InitLedStuff(SetLedStuff *stuff, unsigned wanted, XkbDeviceInfoPtr devi) ...@@ -475,7 +475,7 @@ _InitLedStuff(SetLedStuff *stuff, unsigned wanted, XkbDeviceInfoPtr devi)
static void static void
_FreeLedStuff(SetLedStuff * stuff) _FreeLedStuff(SetLedStuff * stuff)
{ {
if ((stuff->num_info > 0) && (stuff->info != NULL)) if (stuff->num_info > 0)
_XkbFree(stuff->info); _XkbFree(stuff->info);
bzero(stuff, sizeof(SetLedStuff)); bzero(stuff, sizeof(SetLedStuff));
return; return;
......
nx-X11/lib/X11/XKBGeom.c
View file @ dd6dc2dd
...@@ -269,10 +269,9 @@ _XkbReadGeomProperties(XkbReadBufferPtr buf, ...@@ -269,10 +269,9 @@ _XkbReadGeomProperties(XkbReadBufferPtr buf,
ok = _XkbGetReadBufferCountedString(buf, &name) && ok; ok = _XkbGetReadBufferCountedString(buf, &name) && ok;
ok = _XkbGetReadBufferCountedString(buf, &value) && ok; ok = _XkbGetReadBufferCountedString(buf, &value) && ok;
ok = ok && (XkbAddGeomProperty(geom, name, value) != NULL); ok = ok && (XkbAddGeomProperty(geom, name, value) != NULL);
if (name)
_XkbFree(name); _XkbFree(name);
if (value) _XkbFree(value);
_XkbFree(value);
} }
if (ok) if (ok)
rtrn = Success; rtrn = Success;
...@@ -322,8 +321,8 @@ _XkbReadGeomColors(XkbReadBufferPtr buf, ...@@ -322,8 +321,8 @@ _XkbReadGeomColors(XkbReadBufferPtr buf,
rtrn = BadLength; rtrn = BadLength;
else if (XkbAddGeomColor(geom, spec, geom->num_colors) == NULL) else if (XkbAddGeomColor(geom, spec, geom->num_colors) == NULL)
rtrn = BadAlloc; rtrn = BadAlloc;
if (spec)
_XkbFree(spec); _XkbFree(spec);
if (rtrn != Success) if (rtrn != Success)
return rtrn; return rtrn;
} }
......
nx-X11/lib/X11/XKBMAlloc.c
View file @ dd6dc2dd
...@@ -226,18 +226,16 @@ XkbCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into) ...@@ -226,18 +226,16 @@ XkbCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into)
{ {
if ((!from) || (!into)) if ((!from) || (!into))
return BadMatch; return BadMatch;
if (into->map) {
_XkbFree(into->map); _XkbFree(into->map);
into->map = NULL; into->map = NULL;
}
if (into->preserve) { _XkbFree(into->preserve);
_XkbFree(into->preserve); into->preserve = NULL;
into->preserve = NULL;
} _XkbFree(into->level_names);
if (into->level_names) { into->level_names = NULL;
_XkbFree(into->level_names);
into->level_names = NULL;
}
*into = *from; *into = *from;
if ((from->map) && (into->map_count > 0)) { if ((from->map) && (into->map_count > 0)) {
into->map = _XkbTypedCalloc(into->map_count, XkbKTMapEntryRec); into->map = _XkbTypedCalloc(into->map_count, XkbKTMapEntryRec);
...@@ -385,11 +383,9 @@ XkbResizeKeyType(XkbDescPtr xkb, ...@@ -385,11 +383,9 @@ XkbResizeKeyType(XkbDescPtr xkb,
} }
type = &xkb->map->types[type_ndx]; type = &xkb->map->types[type_ndx];
if (map_count == 0) { if (map_count == 0) {
if (type->map != NULL) _XkbFree(type->map);
_XkbFree(type->map);
type->map = NULL; type->map = NULL;
if (type->preserve != NULL) _XkbFree(type->preserve);
_XkbFree(type->preserve);
type->preserve = NULL; type->preserve = NULL;
type->map_count = 0; type->map_count = 0;
} }
...@@ -400,8 +396,7 @@ XkbResizeKeyType(XkbDescPtr xkb, ...@@ -400,8 +396,7 @@ XkbResizeKeyType(XkbDescPtr xkb,
type->map = type->map =
_XkbTypedRealloc(type->map, map_count, XkbKTMapEntryRec); _XkbTypedRealloc(type->map, map_count, XkbKTMapEntryRec);
if (!type->map) { if (!type->map) {
if (prev_map) _XkbFree(prev_map);
_XkbFree(prev_map);
return BadAlloc; return BadAlloc;
} }
if (want_preserve) { if (want_preserve) {
...@@ -412,12 +407,11 @@ XkbResizeKeyType(XkbDescPtr xkb, ...@@ -412,12 +407,11 @@ XkbResizeKeyType(XkbDescPtr xkb,
XkbModsRec); XkbModsRec);
} }
if (!type->preserve) { if (!type->preserve) {
if (prev_preserve) _XkbFree(prev_preserve);
_XkbFree(prev_preserve);
return BadAlloc; return BadAlloc;
} }
} }
else if (type->preserve != NULL) { else {
_XkbFree(type->preserve); _XkbFree(type->preserve);
type->preserve = NULL; type->preserve = NULL;
} }
...@@ -430,8 +424,7 @@ XkbResizeKeyType(XkbDescPtr xkb, ...@@ -430,8 +424,7 @@ XkbResizeKeyType(XkbDescPtr xkb,
type->level_names = type->level_names =
_XkbTypedRealloc(type->level_names, new_num_lvls, Atom); _XkbTypedRealloc(type->level_names, new_num_lvls, Atom);
if (!type->level_names) { if (!type->level_names) {
if (prev_level_names) _XkbFree(prev_level_names);
_XkbFree(prev_level_names);
return BadAlloc; return BadAlloc;
} }
} }
...@@ -948,19 +941,16 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap) ...@@ -948,19 +941,16 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap)
XkbKeyTypePtr type; XkbKeyTypePtr type;
for (i = 0, type = map->types; i < map->num_types; i++, type++) { for (i = 0, type = map->types; i < map->num_types; i++, type++) {
if (type->map != NULL) { _XkbFree(type->map);
_XkbFree(type->map); type->map = NULL;
type->map = NULL;
} _XkbFree(type->preserve);
if (type->preserve != NULL) { type->preserve = NULL;
_XkbFree(type->preserve);
type->preserve = NULL;
}
type->map_count = 0; type->map_count = 0;
if (type->level_names != NULL) {
_XkbFree(type->level_names); _XkbFree(type->level_names);
type->level_names = NULL; type->level_names = NULL;
}
} }
} }
_XkbFree(map->types); _XkbFree(map->types);
...@@ -969,17 +959,14 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap) ...@@ -969,17 +959,14 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap)
} }
} }
if (what & XkbKeySymsMask) { if (what & XkbKeySymsMask) {
if (map->key_sym_map != NULL) { _XkbFree(map->key_sym_map);
_XkbFree(map->key_sym_map); map->key_sym_map = NULL;
map->key_sym_map = NULL;
} _XkbFree(map->syms);
if (map->syms != NULL) { map->size_syms = map->num_syms = 0;
_XkbFree(map->syms); map->syms = NULL;
map->size_syms = map->num_syms = 0;
map->syms = NULL;
}
} }
if ((what & XkbModifierMapMask) && (map->modmap != NULL)) { if (what & XkbModifierMapMask) {
_XkbFree(map->modmap); _XkbFree(map->modmap);
map->modmap = NULL; map->modmap = NULL;
} }
...@@ -1000,26 +987,23 @@ XkbFreeServerMap(XkbDescPtr xkb, unsigned what, Bool freeMap) ...@@ -1000,26 +987,23 @@ XkbFreeServerMap(XkbDescPtr xkb, unsigned what, Bool freeMap)
if (freeMap) if (freeMap)
what = XkbAllServerInfoMask; what = XkbAllServerInfoMask;
map = xkb->server; map = xkb->server;
if ((what & XkbExplicitComponentsMask) && (map->explicit != NULL)) { if (what & XkbExplicitComponentsMask) {
_XkbFree(map->explicit); _XkbFree(map->explicit);
map->explicit = NULL; map->explicit = NULL;
} }
if (what & XkbKeyActionsMask) { if (what & XkbKeyActionsMask) {
if (map->key_acts != NULL) { _XkbFree(map->key_acts);
_XkbFree(map->key_acts);
map->key_acts = NULL; map->key_acts = NULL;
}
if (map->acts != NULL) { _XkbFree(map->acts);
_XkbFree(map->acts);
map->num_acts = map->size_acts = 0; map->num_acts = map->size_acts = 0;
map->acts = NULL; map->acts = NULL;
}
} }
if ((what & XkbKeyBehaviorsMask) && (map->behaviors != NULL)) { if (what & XkbKeyBehaviorsMask) {
_XkbFree(map->behaviors); _XkbFree(map->behaviors);
map->behaviors = NULL; map->behaviors = NULL;
} }
if ((what & XkbVirtualModMapMask) && (map->vmodmap != NULL)) { if (what & XkbVirtualModMapMask) {
_XkbFree(map->vmodmap); _XkbFree(map->vmodmap);
map->vmodmap = NULL; map->vmodmap = NULL;
} }
......
nx-X11/lib/X11/XKBNames.c
View file @ dd6dc2dd
...@@ -133,8 +133,8 @@ _XkbReadGetNamesReply(Display *dpy, ...@@ -133,8 +133,8 @@ _XkbReadGetNamesReply(Display *dpy,
if ((nLevels[i] > 0) && (nLevels[i] != type->num_levels)) { if ((nLevels[i] > 0) && (nLevels[i] != type->num_levels)) {
goto BAILOUT; goto BAILOUT;
} }
if (type->level_names != NULL)
Xfree(type->level_names); Xfree(type->level_names);
if (nLevels[i] == 0) { if (nLevels[i] == 0) {
type->level_names = NULL; type->level_names = NULL;
continue; continue;
......
nx-X11/lib/X11/XKBRdBuf.c
View file @ dd6dc2dd
...@@ -167,8 +167,8 @@ _XkbFreeReadBuffer(XkbReadBufferPtr buf) ...@@ -167,8 +167,8 @@ _XkbFreeReadBuffer(XkbReadBufferPtr buf)
int left; int left;
left = (int) _XkbReadBufferDataLeft(buf); left = (int) _XkbReadBufferDataLeft(buf);
if (buf->start != NULL)
Xfree(buf->start); Xfree(buf->start);
buf->size = 0; buf->size = 0;
buf->start = buf->data = NULL; buf->start = buf->data = NULL;
return left; return left;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment