Add (void) cast in front of rmtree() call at the end of pg_upgrade

michaelpq · michaelpq · commit 42a9e88bf6a8 · 2022-02-07T14:19:52.000+09:00
Most calls of rmtree() report an error, and the code coming from 38bfae3 has introduced one caller where this is not done. The previous behavior was to not fail hard if any log file generated is not properly unlinked when cleaning up the contents generated once the upgrade has completed, so add a cast to (void) to indicate the intention behind this new code. Per gripe from Coverity.
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
@@ -754,5 +754,5 @@ cleanup(void)
 
 	/* Remove dump and log files? */
 	if (!log_opts.retain)
-		rmtree(log_opts.basedir, true);
+		(void) rmtree(log_opts.basedir, true);
 }

Original file line number	Diff line number	Diff line change
`@@ -754,5 +754,5 @@ cleanup(void)`
`754`	`754`
`755`	`755`	`/* Remove dump and log files? */`
`756`	`756`	`if (!log_opts.retain)`
`757`		`- rmtree(log_opts.basedir, true);`
	`757`	`+ (void) rmtree(log_opts.basedir, true);`
`758`	`758`	`}`