Keyboard.c: Simplify if clause

4a1095ff · Ulrich Sibiller · fcb5e8a0 · 4a1095ff
Commit 4a1095ff authored Dec 13, 2016 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +2 -4

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -997,8 +997,7 @@ XkbError:
          XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
                                          nxagentBell, nxagentChangeKeyboardControl);
-          if (!nxagentKeyboard ||
+          if (!nxagentKeyboard || strcmp(nxagentKeyboard, "query") == 0)
-                  (nxagentKeyboard && (strcmp(nxagentKeyboard, "query") == 0)))
          {
            goto XkbError;
          }
@@ -1083,8 +1082,7 @@ XkbError:
          free(nxagentXkbConfigFilePath);
-          if (!nxagentKeyboard ||
+          if (!nxagentKeyboard || strcmp(nxagentKeyboard, "query") == 0)
-                 (nxagentKeyboard && (strcmp(nxagentKeyboard, "query") == 0)))
          {
            goto XkbError;
          }