Fix compiler warning in WaitForBackgroundWorkerStartup().

robertmhaas · robertmhaas · commit 496439d94356 · 2013-09-19T13:00:17.000-04:00
Per complaint from Andrew Gierth.
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
@@ -863,7 +863,6 @@ BgwHandleStatus
 WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pidp)
 {
 	BgwHandleStatus	status;
-	pid_t	pid;
 	int		rc;
 	bool	save_set_latch_on_sigusr1;
 
@@ -874,9 +873,13 @@ WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pidp)
 	{
 		for (;;)
 		{
+			pid_t	pid;
+
 			CHECK_FOR_INTERRUPTS();
 
 			status = GetBackgroundWorkerPid(handle, &pid);
+			if (status == BGWH_STARTED)
+				*pidp = pid;
 			if (status != BGWH_NOT_YET_STARTED)
 				break;
 
@@ -900,6 +903,5 @@ WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pidp)
 	PG_END_TRY();
 
 	set_latch_on_sigusr1 = save_set_latch_on_sigusr1;
-	*pidp = pid;
 	return status;
 }

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,6 @@ BgwHandleStatus`
`863`	`863`	`WaitForBackgroundWorkerStartup(BackgroundWorkerHandle handle, pid_t pidp)`
`864`	`864`	`{`
`865`	`865`	`BgwHandleStatus status;`
`866`		`- pid_t pid;`
`867`	`866`	`int rc;`
`868`	`867`	`bool save_set_latch_on_sigusr1;`
`869`	`868`
`@@ -874,9 +873,13 @@ WaitForBackgroundWorkerStartup(BackgroundWorkerHandle handle, pid_t pidp)`
`874`	`873`	`{`
`875`	`874`	`for (;;)`
`876`	`875`	`{`
	`876`	`+ pid_t pid;`
	`877`	`+`
`877`	`878`	`CHECK_FOR_INTERRUPTS();`
`878`	`879`
`879`	`880`	`status = GetBackgroundWorkerPid(handle, &pid);`
	`881`	`+ if (status == BGWH_STARTED)`
	`882`	`+ *pidp = pid;`
`880`	`883`	`if (status != BGWH_NOT_YET_STARTED)`
`881`	`884`	`break;`
`882`	`885`
`@@ -900,6 +903,5 @@ WaitForBackgroundWorkerStartup(BackgroundWorkerHandle handle, pid_t pidp)`
`900`	`903`	`PG_END_TRY();`
`901`	`904`
`902`	`905`	`set_latch_on_sigusr1 = save_set_latch_on_sigusr1;`
`903`		`- *pidp = pid;`
`904`	`906`	`return status;`
`905`	`907`	`}`