Suppress a couple of compiler warnings seen with older gcc versions.

To wit,
bgworker.c: In function `RegisterDynamicBackgroundWorker':
bgworker.c:761: warning: `generation' might be used uninitialized in this function
dsm_impl.c: In function `dsm_impl_op':
dsm_impl.c:197: warning: control reaches end of non-void function

Neither of these represent actual bugs, but we may as well tweak the code
so that more compilers can tell that.  This won't change the generated code
on compilers that do recognize that the cases are unreachable.

diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 39c81b3aab0060419492207aa686fc62c815632c..48edbb4e30ce774798c9ccefc8e8cfc76338091f 100644 (file)
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -758,7 +758,7 @@ RegisterDynamicBackgroundWorker(BackgroundWorker *worker,
 {
    int     slotno;
    bool    success = false;
-   uint64  generation;
+   uint64  generation = 0;
 
    /*
     * We can't register dynamic background workers from the postmaster.

diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 9f1ea5b0f8444e6221073c7999e4a92cad5e84e8..627f00b7fd993a075191a8b75b31b6be6f950d56 100644 (file)
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -191,9 +191,11 @@ dsm_impl_op(dsm_op op, dsm_handle handle, uint64 request_size,
            return dsm_impl_mmap(op, handle, request_size, impl_private,
                                 mapped_address, mapped_size, elevel);
 #endif
+       default:
+           elog(ERROR, "unexpected dynamic shared memory type: %d",
+                dynamic_shared_memory_type);
+           return false;
    }
-   elog(ERROR, "unexpected dynamic shared memory type: %d",
-        dynamic_shared_memory_type);
 }
 
 /*