diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2017-07-24 23:45:24 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2017-07-24 23:45:24 +0200 |
commit | 36e583cf52a0a19183bdee69431c306d8e7df5b7 (patch) | |
tree | 642fffd05aa6de289658786c86bde42a189bc99f /nx-X11/programs/Xserver/hw/nxagent/Args.c | |
parent | b007b542df5cf6388340a81ad812473dcf8c616d (diff) | |
download | nx-libs-36e583cf52a0a19183bdee69431c306d8e7df5b7.tar.gz nx-libs-36e583cf52a0a19183bdee69431c306d8e7df5b7.tar.bz2 nx-libs-36e583cf52a0a19183bdee69431c306d8e7df5b7.zip |
rename nxagentOptionFile to nxagentOptionsFilename
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 26 |
1 files changed, 13 insertions, 13 deletions
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 { |