Fix C error reported by Oracle compiler.

macdice · macdice · commit 049c8cb9a239 · 2025-01-08T17:04:26.000+13:00
Commit 66aaabe (branches 13 - 17 only) was not acceptable to the Oracle Developer Studio compiler on build farm animal wrasse. It accidentally used a C++ style return statement to wrap a void function. None of the usual compilers complained, but it is right, that is not allowed in C. Fix. Reported-by: Michael Paquier <michael@paquier.xyz> Discussion: https://postgr.es/m/Z33vgfVgvOnbFLN9%40paquier.xyz
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
@@ -599,7 +599,7 @@ smgrtruncate(SMgrRelation reln, ForkNumber *forknum, int nforks,
 	for (int i = 0; i < nforks; ++i)
 		old_nblocks[i] = smgrnblocks(reln, forknum[i]);
 
-	return smgrtruncate2(reln, forknum, nforks, old_nblocks, nblocks);
+	smgrtruncate2(reln, forknum, nforks, old_nblocks, nblocks);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,7 @@ smgrtruncate(SMgrRelation reln, ForkNumber *forknum, int nforks,`
`599`	`599`	`for (int i = 0; i < nforks; ++i)`
`600`	`600`	`old_nblocks[i] = smgrnblocks(reln, forknum[i]);`
`601`	`601`
`602`		`- return smgrtruncate2(reln, forknum, nforks, old_nblocks, nblocks);`
	`602`	`+ smgrtruncate2(reln, forknum, nforks, old_nblocks, nblocks);`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`/*`