Commite0bf160

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 parent26aa1cf commite0bf160Copy full SHA for e0bf160

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -351,12 +351,12 @@ DisconnectDatabase(Archive *AHX)`
`351`	`351`	`if (AH->connCancel)`
`352`	`352`	`{`
`353`	`353`	`/*`
`354`		`- * If we have an active query, send a cancel before closing. This is`
`355`		`- * of no use for a normal exit, but might be helpful during`
`356`		`- * exit_horribly().`
	`354`	`+ * If we have an active query, send a cancel before closing, ignoring`
	`355`	`+ *any errors. This isof no use for a normal exit, but might be`
	`356`	`+ *helpful duringexit_horribly().`
`357`	`357`	`*/`
`358`	`358`	`if (PQtransactionStatus(AH->connection)==PQTRANS_ACTIVE)`
`359`		`-PQcancel(AH->connCancel,errbuf,sizeof(errbuf));`
	`359`	`+(void)PQcancel(AH->connCancel,errbuf,sizeof(errbuf));`
`360`	`360`
`361`	`361`	`/*`
`362`	`362`	`* 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
`@@ -860,7 +860,7 @@ DisconnectDatabase(ParallelSlot *slot)`
`860`	`860`
`861`	`861`	`if ((cancel=PQgetCancel(slot->connection)))`
`862`	`862`	`{`
`863`		`-PQcancel(cancel,errbuf,sizeof(errbuf));`
	`863`	`+(void)PQcancel(cancel,errbuf,sizeof(errbuf));`
`864`	`864`	`PQfreeCancel(cancel);`
`865`	`865`	`}`
`866`	`866`	`}`

Comments

(0)