From dd6dc2ddfa8b0cb671711acb9d157de29a48c032 Mon Sep 17 00:00:00 2001
From: walter harms <wharms@bfs.de>
Date: Sat, 7 Jun 2014 11:54:34 +0200
Subject: rm redundant null checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

remove more redundant NULL checks
note that _XkbFree() is really Xfree()

Signed-off-by: Harms <wharms@bfs,de>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
---
 nx-X11/lib/X11/XKBGeom.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'nx-X11/lib/X11/XKBGeom.c')

diff --git a/nx-X11/lib/X11/XKBGeom.c b/nx-X11/lib/X11/XKBGeom.c
index 0145da8c1..f57fe7cf6 100644
--- a/nx-X11/lib/X11/XKBGeom.c
+++ b/nx-X11/lib/X11/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;
         }
-- 
cgit v1.2.3