Fix some typos I introduced in WIN32-only code late last night.

tglsfdc · tglsfdc · commit 1b9ef0025d17 · 2004-05-28T15:14:03.000Z
Thanks to Thomas Hallgren.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.398 2004/05/28 05:12:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.399 2004/05/28 15:14:03 tgl Exp $
  *
  * NOTES
  *
@@ -3520,7 +3520,7 @@ ShmemBackendArrayRemove(pid_t pid)
 
 	ereport(WARNING,
 			(errmsg_internal("unable to find backend entry with pid %d",
-							 pid)));
+							 (int) pid)));
 }
 
 #endif /* EXEC_BACKEND */
@@ -3533,24 +3533,23 @@ win32_forkexec(const char *path, char *argv[])
 {
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
-	char	   *p;
 	int			i;
 	int			j;
 	char		cmdLine[MAXPGPATH * 2];
 	HANDLE		childHandleCopy;
 	HANDLE		waiterThread;
 
 	/* Format the cmd line */
-	cmdline[sizeof(cmdLine)-1] = '\0';
-	cmdline[sizeof(cmdLine)-2] = '\0';
+	cmdLine[sizeof(cmdLine)-1] = '\0';
+	cmdLine[sizeof(cmdLine)-2] = '\0';
 	snprintf(cmdLine, sizeof(cmdLine)-1, "\"%s\"", path);
 	i = 0;
 	while (argv[++i] != NULL)
 	{
 		j = strlen(cmdLine);
 		snprintf(cmdLine+j, sizeof(cmdLine)-1-j, " \"%s\"", argv[i]);
 	}
-	if (cmdline[sizeof(cmdLine)-2] != '\0')
+	if (cmdLine[sizeof(cmdLine)-2] != '\0')
 	{
 		elog(LOG, "subprocess command line too long");
 		return -1;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.398 2004/05/28 05:12:58 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.399 2004/05/28 15:14:03 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -3520,7 +3520,7 @@ ShmemBackendArrayRemove(pid_t pid)`
`3520`	`3520`
`3521`	`3521`	`ereport(WARNING,`
`3522`	`3522`	`(errmsg_internal("unable to find backend entry with pid %d",`
`3523`		`- pid)));`
	`3523`	`+ (int) pid)));`
`3524`	`3524`	`}`
`3525`	`3525`
`3526`	`3526`	`#endif /* EXEC_BACKEND */`
`@@ -3533,24 +3533,23 @@ win32_forkexec(const char path, char argv[])`
`3533`	`3533`	`{`
`3534`	`3534`	`STARTUPINFO si;`
`3535`	`3535`	`PROCESS_INFORMATION pi;`
`3536`		`- char *p;`
`3537`	`3536`	`int i;`
`3538`	`3537`	`int j;`
`3539`	`3538`	`char cmdLine[MAXPGPATH * 2];`
`3540`	`3539`	`HANDLE childHandleCopy;`
`3541`	`3540`	`HANDLE waiterThread;`
`3542`	`3541`
`3543`	`3542`	`/* Format the cmd line */`
`3544`		`- cmdline[sizeof(cmdLine)-1] = '\0';`
`3545`		`- cmdline[sizeof(cmdLine)-2] = '\0';`
	`3543`	`+ cmdLine[sizeof(cmdLine)-1] = '\0';`
	`3544`	`+ cmdLine[sizeof(cmdLine)-2] = '\0';`
`3546`	`3545`	`snprintf(cmdLine, sizeof(cmdLine)-1, "\"%s\"", path);`
`3547`	`3546`	`i = 0;`
`3548`	`3547`	`while (argv[++i] != NULL)`
`3549`	`3548`	`{`
`3550`	`3549`	`j = strlen(cmdLine);`
`3551`	`3550`	`snprintf(cmdLine+j, sizeof(cmdLine)-1-j, " \"%s\"", argv[i]);`
`3552`	`3551`	`}`
`3553`		`- if (cmdline[sizeof(cmdLine)-2] != '\0')`
	`3552`	`+ if (cmdLine[sizeof(cmdLine)-2] != '\0')`
`3554`	`3553`	`{`
`3555`	`3554`	`elog(LOG, "subprocess command line too long");`
`3556`	`3555`	`return -1;`