Silence compiler warnings
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Fri, 23 Nov 2018 16:01:05 +0000 (13:01 -0300)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Fri, 23 Nov 2018 16:01:05 +0000 (13:01 -0300)
Commit cfdf4dc4fc96 left a few unnecessary assignments, one of which
caused compiler warnings, as reported by Erik Rijkers.  Remove them all.

Discussion: https://postgr.es/m/df0dcca2025b3d90d946ecc508ca9678@xs4all.nl

contrib/pg_prewarm/autoprewarm.c
src/backend/postmaster/bgwriter.c
src/test/modules/worker_spi/worker_spi.c

index c2a6e5a53f7386bc80274b7580f97423727c674d..033ad364777ea3b7cfd77957f9624903cbbba322 100644 (file)
@@ -207,8 +207,6 @@ autoprewarm_main(Datum main_arg)
        /* Periodically dump buffers until terminated. */
        while (!got_sigterm)
        {
-               int                     rc;
-
                /* In case of a SIGHUP, just reload the configuration. */
                if (got_sighup)
                {
@@ -219,10 +217,10 @@ autoprewarm_main(Datum main_arg)
                if (autoprewarm_interval <= 0)
                {
                        /* We're only dumping at shutdown, so just wait forever. */
-                       rc = WaitLatch(&MyProc->procLatch,
-                                                  WL_LATCH_SET | WL_EXIT_ON_PM_DEATH,
-                                                  -1L,
-                                                  PG_WAIT_EXTENSION);
+                       (void) WaitLatch(&MyProc->procLatch,
+                                                        WL_LATCH_SET | WL_EXIT_ON_PM_DEATH,
+                                                        -1L,
+                                                        PG_WAIT_EXTENSION);
                }
                else
                {
@@ -248,10 +246,10 @@ autoprewarm_main(Datum main_arg)
                        }
 
                        /* Sleep until the next dump time. */
-                       rc = WaitLatch(&MyProc->procLatch,
-                                                  WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
-                                                  delay_in_ms,
-                                                  PG_WAIT_EXTENSION);
+                       (void) WaitLatch(&MyProc->procLatch,
+                                                        WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
+                                                        delay_in_ms,
+                                                        PG_WAIT_EXTENSION);
                }
 
                /* Reset the latch, loop. */
index bd8dc61182d90553552d60f8859cb2dd8785d7d5..7612b17b4421fce3d0632f66200975c55ad7bbf6 100644 (file)
@@ -361,10 +361,10 @@ BackgroundWriterMain(void)
                        /* Ask for notification at next buffer allocation */
                        StrategyNotifyBgWriter(MyProc->pgprocno);
                        /* Sleep ... */
-                       rc = WaitLatch(MyLatch,
-                                                  WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
-                                                  BgWriterDelay * HIBERNATE_FACTOR,
-                                                  WAIT_EVENT_BGWRITER_HIBERNATE);
+                       (void) WaitLatch(MyLatch,
+                                                        WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
+                                                        BgWriterDelay * HIBERNATE_FACTOR,
+                                                        WAIT_EVENT_BGWRITER_HIBERNATE);
                        /* Reset the notification request in case we timed out */
                        StrategyNotifyBgWriter(-1);
                }
index 52a3208527eeedb755eeed20fb63d0c6078c60ea..838133a20819604b8186fe1e74d2543c34e5d3ba 100644 (file)
@@ -217,7 +217,6 @@ worker_spi_main(Datum main_arg)
        while (!got_sigterm)
        {
                int                     ret;
-               int                     rc;
 
                /*
                 * Background workers mustn't call usleep() or any direct equivalent:
@@ -225,10 +224,10 @@ worker_spi_main(Datum main_arg)
                 * necessary, but is awakened if postmaster dies.  That way the
                 * background process goes away immediately in an emergency.
                 */
-               rc = WaitLatch(MyLatch,
-                                          WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
-                                          worker_spi_naptime * 1000L,
-                                          PG_WAIT_EXTENSION);
+               (void) WaitLatch(MyLatch,
+                                                WL_LATCH_SET | WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
+                                                worker_spi_naptime * 1000L,
+                                                PG_WAIT_EXTENSION);
                ResetLatch(MyLatch);
 
                CHECK_FOR_INTERRUPTS();