Commitbfaba24

committed

Ignore PQcancel errors properly

Add a (void) cast to all PQcancel() calls that purposefully don't checkthe return value, to keep compilers and static checkers happy.Per Coverity.

1 parentca9cfed commitbfaba24Copy full SHA for bfaba24

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -360,12 +360,12 @@ DisconnectDatabase(Archive *AHX)`
`360`	`360`	`if (AH->connCancel)`
`361`	`361`	`{`
`362`	`362`	`/*`
`363`		`- * If we have an active query, send a cancel before closing. This is`
`364`		`- * of no use for a normal exit, but might be helpful during`
`365`		`- * exit_horribly().`
	`363`	`+ * If we have an active query, send a cancel before closing, ignoring`
	`364`	`+ *any errors. This isof no use for a normal exit, but might be`
	`365`	`+ *helpful duringexit_horribly().`
`366`	`366`	`*/`
`367`	`367`	`if (PQtransactionStatus(AH->connection)==PQTRANS_ACTIVE)`
`368`		`-PQcancel(AH->connCancel,errbuf,sizeof(errbuf));`
	`368`	`+(void)PQcancel(AH->connCancel,errbuf,sizeof(errbuf));`
`369`	`369`
`370`	`370`	`/*`
`371`	`371`	`* Prevent signal handler from sending a cancel after this.`

Lines changed: 1 addition & 1 deletion

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`	`}`

Comments

(0)