[X2Go-Commits] [nx-libs] 93/108: Keyboard.c: simplify even more: free stuff at one place

git-admin at x2go.org git-admin at x2go.org
Fri Nov 9 20:35:57 CET 2018


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

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

commit 59524cd062f87874f11d566a32836a97e8426382
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Jul 18 22:16:48 2018 +0200

    Keyboard.c: simplify even more: free stuff at one place
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index eea09a4..c2c36ad 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -723,14 +723,6 @@ XkbError:
         fprintf(stderr, "nxagentKeyboardProc: XKB error.\n");
         #endif
 
-        if (xkb)
-        {
-            XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
-            xkb = NULL;
-        }
-
-        free(model);
-        free(layout);
 #endif
         XGetKeyboardControl(nxagentDisplay, &values);
 
@@ -863,16 +855,16 @@ XkbError:
         {
           NXShadowInitKeymap(&(pDev->key->curKeySyms));
         }
+      }
 
-        if (xkb)
-        {
-            XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
-            xkb = NULL;
-        }
-
-        free(model);
-        free(layout);
+      if (xkb)
+      {
+          XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
+          xkb = NULL;
       }
+
+      free(model);
+      free(layout);
 #endif
 
       #ifdef WATCH

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


More information about the x2go-commits mailing list