Ignore PQcancel errors properly

alvherre · alvherre · commit bfaba24829f5 · 2017-05-09T14:58:51.000-03:00
Add a (void) cast to all PQcancel() calls that purposefully don't check
the return value, to keep compilers and static checkers happy.

Per Coverity.
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -360,12 +360,12 @@ DisconnectDatabase(Archive *AHX)
 	if (AH->connCancel)
 	{
 		/*
-		 * If we have an active query, send a cancel before closing.  This is
-		 * of no use for a normal exit, but might be helpful during
-		 * exit_horribly().
+		 * If we have an active query, send a cancel before closing, ignoring
+		 * any errors.  This is of no use for a normal exit, but might be
+		 * helpful during exit_horribly().
 		 */
 		if (PQtransactionStatus(AH->connection) == PQTRANS_ACTIVE)
-			PQcancel(AH->connCancel, errbuf, sizeof(errbuf));
+			(void) PQcancel(AH->connCancel, errbuf, sizeof(errbuf));
 
 		/*
 		 * Prevent signal handler from sending a cancel after this.
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -854,7 +854,7 @@ DisconnectDatabase(ParallelSlot *slot)
 
 		if ((cancel = PQgetCancel(slot->connection)))
 		{
-			PQcancel(cancel, errbuf, sizeof(errbuf));
+			(void) PQcancel(cancel, errbuf, sizeof(errbuf));
 			PQfreeCancel(cancel);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ DisconnectDatabase(ParallelSlot *slot)`
`854`	`854`
`855`	`855`	`if ((cancel = PQgetCancel(slot->connection)))`
`856`	`856`	`{`
`857`		`- PQcancel(cancel, errbuf, sizeof(errbuf));`
	`857`	`+ (void) PQcancel(cancel, errbuf, sizeof(errbuf));`
`858`	`858`	`PQfreeCancel(cancel);`
`859`	`859`	`}`
`860`	`860`	`}`