aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-18 23:35:39 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-11-21 01:41:57 +0100
commitdc43f4c98287b283747e47e37501c5ca158a8aa6 (patch)
tree0c738dec27fdbdf055bf72caa0c96a57d6a706cf /nx-X11/programs/Xserver/hw
parent7e975e3ccff9aa809c1fec7b2642615f2a934c10 (diff)
downloadnx-libs-dc43f4c98287b283747e47e37501c5ca158a8aa6.tar.gz
nx-libs-dc43f4c98287b283747e47e37501c5ca158a8aa6.tar.bz2
nx-libs-dc43f4c98287b283747e47e37501c5ca158a8aa6.zip
Error.c: simply nxagentGetClientsPath()
nxagentGetClientsPath() allocated and returned a string that was never used anywhere because it also fills the global variable with the same value.
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Error.c39
1 files changed, 8 insertions, 31 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index 05d0f3081..c56275922 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -98,7 +98,7 @@ static char nxagentRootDir[DEFAULT_STRING_LENGTH] = { 0 };
static char nxagentSessionDir[DEFAULT_STRING_LENGTH] = { 0 };
-char *nxagentGetClientsPath(void);
+void nxagentGetClientsPath(void);
static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp);
@@ -247,16 +247,9 @@ int nxagentExitHandler(const char *message)
void nxagentOpenClientsLogFile()
{
- char * clientsLogName;
-
if (*nxagentClientsLogName == '\0')
{
- clientsLogName = nxagentGetClientsPath();
-
- if (clientsLogName != NULL)
- {
- free(clientsLogName);
- }
+ nxagentGetClientsPath();
}
if (nxagentClientsLogName != NULL && *nxagentClientsLogName !='\0')
@@ -593,30 +586,27 @@ char *nxagentGetSessionPath(void)
return sessionPath;
}
-char *nxagentGetClientsPath()
+void nxagentGetClientsPath()
{
- char *sessionPath;
- char *clientsPath;
if (*nxagentClientsLogName == '\0')
{
- sessionPath = nxagentGetSessionPath();
+ char *sessionPath = nxagentGetSessionPath();
if (sessionPath == NULL)
{
- return NULL;
+ return;
}
if (strlen(sessionPath) + strlen("/clients") > DEFAULT_STRING_LENGTH - 1)
{
#ifdef PANIC
- fprintf(stderr, "nxagentGetClientsPath: PANIC! Invalid value for the NX clients Log File Path '%s'.\n",
- nxagentClientsLogName);
+ fprintf(stderr, "nxagentGetClientsPath: PANIC! Invalid value for the NX clients Log File Path ''.\n");
#endif
free(sessionPath);
- return NULL;
+ return;
}
strcpy(nxagentClientsLogName, sessionPath);
@@ -626,19 +616,6 @@ char *nxagentGetClientsPath()
free(sessionPath);
}
- clientsPath = malloc(strlen(nxagentClientsLogName) + 1);
-
- if (clientsPath == NULL)
- {
- #ifdef PANIC
- fprintf(stderr, "nxagentGetClientsPath: PANIC! Can't allocate memory for the clients Log File Path path.\n");
- #endif
-
- return NULL;
- }
-
- strcpy(clientsPath, nxagentClientsLogName);
-
- return clientsPath;
+ return;
}