From 36e583cf52a0a19183bdee69431c306d8e7df5b7 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 24 Jul 2017 23:45:24 +0200
Subject: rename nxagentOptionFile to nxagentOptionsFilename

---
 nx-X11/programs/Xserver/hw/nxagent/Args.c      | 26 +++++++++++++-------------
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'nx-X11/programs/Xserver')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index cc9ec8523..d5cbfbce3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -135,7 +135,7 @@ char nxagentShadowDisplayName[1024] = {0};
 char nxagentWindowName[256];
 char nxagentDialogName[256];
 char nxagentSessionId[256] = {0};
-char *nxagentOptionFile;
+char *nxagentOptionsFilename;
 
 Bool nxagentFullGeneration = False;
 int nxagentDefaultClass = TrueColor;
@@ -259,18 +259,18 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     {
       if ((!strcmp(argv[j], "-options") || !strcmp(argv[j], "-option")) && j + 1 < argc)
       {
-        if (nxagentOptionFile)
+        if (nxagentOptionsFilename)
         {
-          nxagentOptionFile = (char *) realloc(nxagentOptionFile, strlen(argv[j + 1]) + 1);
+          nxagentOptionsFilename = (char *) realloc(nxagentOptionsFilename, strlen(argv[j + 1]) + 1);
         }
         else
         {
-          nxagentOptionFile = (char *) malloc(strlen(argv[j + 1]) +1);
+          nxagentOptionsFilename = (char *) malloc(strlen(argv[j + 1]) +1);
         }
 
-        if (nxagentOptionFile != NULL)
+        if (nxagentOptionsFilename != NULL)
         {
-          nxagentOptionFile = strcpy(nxagentOptionFile, argv[j + 1]);
+          nxagentOptionsFilename = strcpy(nxagentOptionsFilename, argv[j + 1]);
         }
         #ifdef WARNING
         else
@@ -283,7 +283,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
       }
     }
 
-    if (nxagentOptionFile)
+    if (nxagentOptionsFilename)
     {
       nxagentProcessOptionsFile();
     }
@@ -365,23 +365,23 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     {
       int size;
 
-      if (nxagentOptionFile != NULL)
+      if (nxagentOptionsFilename != NULL)
       {
-        free(nxagentOptionFile);
+        free(nxagentOptionsFilename);
 
-        nxagentOptionFile = NULL;
+        nxagentOptionsFilename = NULL;
       }
 
       if ((size = strlen(argv[i])) < 1024)
       {
-        if ((nxagentOptionFile = malloc(size + 1)) == NULL)
+        if ((nxagentOptionsFilename = malloc(size + 1)) == NULL)
         {
           FatalError("malloc failed");
         }
 
-        strncpy(nxagentOptionFile, argv[i], size);
+        strncpy(nxagentOptionsFilename, argv[i], size);
 
-        nxagentOptionFile[size] = '\0';
+        nxagentOptionsFilename[size] = '\0';
       }
       else
       {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 937bd1eff..902fe36be 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -103,7 +103,7 @@ extern Bool nxagentRenderEnable;
 
 extern char *nxagentKeyboard;
 
-extern char *nxagentOptionFile;
+extern char *nxagentOptionsFilename;
 
 enum SESSION_STATE nxagentSessionState = SESSION_STARTING;
 
@@ -456,7 +456,7 @@ Bool nxagentReconnectSession(void)
 
   nxagentResetOptions();
 
-  nxagentProcessOptionsFile(nxagentOptionFile);
+  nxagentProcessOptionsFile(nxagentOptionsFilename);
 
   if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0)
   {
-- 
cgit v1.2.3