aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xkb/XKBGeom.c
diff options
context:
space:
mode:
Diffstat (limited to 'libX11/src/xkb/XKBGeom.c')
-rw-r--r--libX11/src/xkb/XKBGeom.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c
index c42a453e4..ea52b85f1 100644
--- a/libX11/src/xkb/XKBGeom.c
+++ b/libX11/src/xkb/XKBGeom.c
@@ -265,10 +265,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;
@@ -318,8 +317,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;
}