Args.c: make nxagentGetDialogName() more readable

uli42 · uli42 · commit e4c245bc9be8 · 2017-11-21T00:45:48.000+01:00
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1998,15 +1998,14 @@ static int nxagentGetDialogName()
 
   if (*nxagentSessionId != '\0')
   {
-    int length = strlen(nxagentSessionId);
+    int length = strlen(nxagentSessionId) - (MD5_LENGTH * 2 + 1);
     const char prefix[] = "NX - ";
 
     strcpy(nxagentDialogName, prefix);
 
-    if (length > (MD5_LENGTH * 2 + 1) &&
-           *(nxagentSessionId + (length - (MD5_LENGTH * 2 + 1))) == '-')
+    if (length > 0 && nxagentSessionId[length] == '-')
     {
-      strncat(nxagentDialogName, nxagentSessionId, length - (MD5_LENGTH * 2 + 1));
+      strncat(nxagentDialogName, nxagentSessionId, length));
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -1998,15 +1998,14 @@ static int nxagentGetDialogName()`
`1998`	`1998`
`1999`	`1999`	`if (*nxagentSessionId != '\0')`
`2000`	`2000`	`{`
`2001`		`- int length = strlen(nxagentSessionId);`
	`2001`	`+ int length = strlen(nxagentSessionId) - (MD5_LENGTH * 2 + 1);`
`2002`	`2002`	`const char prefix[] = "NX - ";`
`2003`	`2003`
`2004`	`2004`	`strcpy(nxagentDialogName, prefix);`
`2005`	`2005`
`2006`		`- if (length > (MD5_LENGTH * 2 + 1) &&`
`2007`		`- (nxagentSessionId + (length - (MD5_LENGTH 2 + 1))) == '-')`
	`2006`	`+ if (length > 0 && nxagentSessionId[length] == '-')`
`2008`	`2007`	`{`
`2009`		`- strncat(nxagentDialogName, nxagentSessionId, length - (MD5_LENGTH * 2 + 1));`
	`2008`	`+ strncat(nxagentDialogName, nxagentSessionId, length));`
`2010`	`2009`	`}`
`2011`	`2010`	`else`
`2012`	`2011`	`{`