Suppress a recently-introduced 'variable might be clobbered by longjmp' warning.

tglsfdc · tglsfdc · commit fab789eac9fc · 2007-05-04T02:06:13.000Z
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.44 2007/05/02 18:27:57 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.45 2007/05/04 02:06:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1288,7 +1288,7 @@ NON_EXEC_STATIC void
 AutoVacWorkerMain(int argc, char *argv[])
 {
 	sigjmp_buf	local_sigjmp_buf;
-	Oid			dbid = InvalidOid;
+	Oid			dbid;
 
 	/* we are a postmaster subprocess now */
 	IsUnderPostmaster = true;
@@ -1410,8 +1410,8 @@ AutoVacWorkerMain(int argc, char *argv[])
 		SHMQueueInsertBefore(&AutoVacuumShmem->av_runningWorkers, 
 							 &MyWorkerInfo->wi_links);
 		/*
-		 * remove from the "starting" pointer, so that the launcher can start a new
-		 * worker if required
+		 * remove from the "starting" pointer, so that the launcher can start
+		 * a new worker if required
 		 */
 		AutoVacuumShmem->av_startingWorker = INVALID_OFFSET;
 		LWLockRelease(AutovacuumLock);
@@ -1423,8 +1423,11 @@ AutoVacWorkerMain(int argc, char *argv[])
 			kill(AutoVacuumShmem->av_launcherpid, SIGUSR1);
 	}
 	else
+	{
 		/* no worker entry for me, go away */
+		dbid = InvalidOid;
 		LWLockRelease(AutovacuumLock);
+	}
 
 	if (OidIsValid(dbid))
 	{
@@ -1474,7 +1477,8 @@ AutoVacWorkerMain(int argc, char *argv[])
 }
 
 /*
- * Return a WorkerInfo to the free list */
+ * Return a WorkerInfo to the free list
+ */
 static void
 FreeWorkerInfo(int code, Datum arg)
 {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.44 2007/05/02 18:27:57 alvherre Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.45 2007/05/04 02:06:13 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1288,7 +1288,7 @@ NON_EXEC_STATIC void`
`1288`	`1288`	`AutoVacWorkerMain(int argc, char *argv[])`
`1289`	`1289`	`{`
`1290`	`1290`	`sigjmp_buf local_sigjmp_buf;`
`1291`		`- Oid dbid = InvalidOid;`
	`1291`	`+ Oid dbid;`
`1292`	`1292`
`1293`	`1293`	`/* we are a postmaster subprocess now */`
`1294`	`1294`	`IsUnderPostmaster = true;`
`@@ -1410,8 +1410,8 @@ AutoVacWorkerMain(int argc, char *argv[])`
`1410`	`1410`	`SHMQueueInsertBefore(&AutoVacuumShmem->av_runningWorkers,`
`1411`	`1411`	`&MyWorkerInfo->wi_links);`
`1412`	`1412`	`/*`
`1413`		`- * remove from the "starting" pointer, so that the launcher can start a new`
`1414`		`- * worker if required`
	`1413`	`+ * remove from the "starting" pointer, so that the launcher can start`
	`1414`	`+ * a new worker if required`
`1415`	`1415`	`*/`
`1416`	`1416`	`AutoVacuumShmem->av_startingWorker = INVALID_OFFSET;`
`1417`	`1417`	`LWLockRelease(AutovacuumLock);`
`@@ -1423,8 +1423,11 @@ AutoVacWorkerMain(int argc, char *argv[])`
`1423`	`1423`	`kill(AutoVacuumShmem->av_launcherpid, SIGUSR1);`
`1424`	`1424`	`}`
`1425`	`1425`	`else`
	`1426`	`+ {`
`1426`	`1427`	`/* no worker entry for me, go away */`
	`1428`	`+ dbid = InvalidOid;`
`1427`	`1429`	`LWLockRelease(AutovacuumLock);`
	`1430`	`+ }`
`1428`	`1431`
`1429`	`1432`	`if (OidIsValid(dbid))`
`1430`	`1433`	`{`
`@@ -1474,7 +1477,8 @@ AutoVacWorkerMain(int argc, char *argv[])`
`1474`	`1477`	`}`
`1475`	`1478`
`1476`	`1479`	`/*`
`1477`		`- * Return a WorkerInfo to the free list */`
	`1480`	`+ * Return a WorkerInfo to the free list`
	`1481`	`+ */`
`1478`	`1482`	`static void`
`1479`	`1483`	`FreeWorkerInfo(int code, Datum arg)`
`1480`	`1484`	`{`