fixup! Args.c: don't use hardcoded string buffer lengths

uli42 · uli42 · commit 7607a66e3703 · 2017-11-19T14:09:02.000+01:00
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -652,7 +652,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     {
       strncpy(nxagentWindowName, argv[i], sizeof(nxagentWindowName) - 1);
 
-      nxagentWindowName[sizeof(nxagentWindowName)·-·1] = '\0';
+      nxagentWindowName[sizeof(nxagentWindowName) - 1] = '\0';
 
       return 2;
     }
@@ -2097,7 +2097,7 @@ static int nxagentGetDialogName()
   if (*nxagentSessionId != '\0')
   {
     int length = strlen(nxagentSessionId);
-    const char prefix = "NX - ";
+    const char prefix[] = "NX - ";
 
     strcpy(nxagentDialogName, prefix);
 

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)`
`652`	`652`	`{`
`653`	`653`	`strncpy(nxagentWindowName, argv[i], sizeof(nxagentWindowName) - 1);`
`654`	`654`
`655`		`- nxagentWindowName[sizeof(nxagentWindowName)·-·1] = '\0';`
	`655`	`+ nxagentWindowName[sizeof(nxagentWindowName) - 1] = '\0';`
`656`	`656`
`657`	`657`	`return 2;`
`658`	`658`	`}`
`@@ -2097,7 +2097,7 @@ static int nxagentGetDialogName()`
`2097`	`2097`	`if (*nxagentSessionId != '\0')`
`2098`	`2098`	`{`
`2099`	`2099`	`int length = strlen(nxagentSessionId);`
`2100`		`- const char prefix = "NX - ";`
	`2100`	`+ const char prefix[] = "NX - ";`
`2101`	`2101`
`2102`	`2102`	`strcpy(nxagentDialogName, prefix);`
`2103`	`2103`