[X2Go-Commits] [nx-libs] 178/429: Keyboard.c: simplify code

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 41bf839792be7c20447251fd679b6132775749db
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Aug 3 17:02:29 2020 +0200

    Keyboard.c: simplify code
    
    Based on PVS Studio finding: "V547 Expression 'data' is always true."
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 00db6ce2a..8f29d66b8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1425,11 +1425,9 @@ static void nxagentXkbGetRemoteNames(void)
 
   if ((after > 0) || (type != XA_STRING) || (format != 8))
   {
-    if (data)
-    {
-      SAFE_XFree(data);
-      return;
-    }
+    /* data non-null - has been checked above */
+    SAFE_XFree(data);
+    return;
   }
 
   char *name = data;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git