]> granicus.if.org Git - postgresql/commitdiff
Fix compiler warning in WaitForBackgroundWorkerStartup().
authorRobert Haas <rhaas@postgresql.org>
Thu, 19 Sep 2013 17:00:17 +0000 (13:00 -0400)
committerRobert Haas <rhaas@postgresql.org>
Thu, 19 Sep 2013 17:00:17 +0000 (13:00 -0400)
Per complaint from Andrew Gierth.

src/backend/postmaster/bgworker.c

index 25e61568bd4eeacc73ab46a5f01009bc8a7d9923..0e7a4a53a143cb04f276092a9840479301457c04 100644 (file)
@@ -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;
 }