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

tglsfdc · tglsfdc · commit 5f1ab4610102 · 2013-10-22T21:31:57.000-04:00
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
@@ -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
@@ -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);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ RegisterDynamicBackgroundWorker(BackgroundWorker *worker,`
`758`	`758`	`{`
`759`	`759`	`int slotno;`
`760`	`760`	`bool success = false;`
`761`		`- uint64 generation;`
	`761`	`+ uint64 generation = 0;`
`762`	`762`
`763`	`763`	`/*`
`764`	`764`	`* We can't register dynamic background workers from the postmaster.`
Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,11 @@ dsm_impl_op(dsm_op op, dsm_handle handle, uint64 request_size,`
`191`	`191`	`return dsm_impl_mmap(op, handle, request_size, impl_private,`
`192`	`192`	`mapped_address, mapped_size, elevel);`
`193`	`193`	`#endif`
	`194`	`+ default:`
	`195`	`+ elog(ERROR, "unexpected dynamic shared memory type: %d",`
	`196`	`+ dynamic_shared_memory_type);`
	`197`	`+ return false;`
`194`	`198`	`}`
`195`		`- elog(ERROR, "unexpected dynamic shared memory type: %d",`
`196`		`- dynamic_shared_memory_type);`
`197`	`199`	`}`
`198`	`200`
`199`	`201`	`/*`