Keyboard.c: Fix and simplify keyboard config file handling

keyboard config file for nxagent/x2goagent was broken from the moment it got implemented. nxagentXkbConfigFilePath had never been filled.

Keyboard.c: Fix and simplify keyboard config file handling
2f7f39b4 · Ulrich Sibiller · 8793e362 · 2f7f39b4
Commit 2f7f39b4 authored Oct 25, 2016 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 12 deletions

Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +3 -12

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -871,8 +871,6 @@ XkbError:
        FILE *file;
        XkbConfigRtrnRec config;

-        int nxagentXkbConfigFilePathSize;
-
        char *nxagentXkbConfigFilePath;

        XkbComponentNamesRec names;
@@ -1019,22 +1017,15 @@ XkbError:
        XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);

        if (nxagentX2go)
-            nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO);
+          nxagentXkbConfigFilePath = strdup(XKB_CONFIG_FILE_X2GO);
        else
-            nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX);
-
-        nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
+          nxagentXkbConfigFilePath = strdup(XKB_CONFIG_FILE_NX);

-        if ( nxagentXkbConfigFilePath == NULL)
+        if (nxagentXkbConfigFilePath == NULL)
        {
          FatalError("nxagentKeyboardProc: malloc failed.");
        }

-        if (nxagentX2go)
-            nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO);
-        else
-            nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX);
- 
        #ifdef TEST
        fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n",
                    nxagentXkbConfigFilePath);