Commit92fce4e

committed

Reduce warnings with -Wshadow=compatible-local builds

In a similar effort tof01592f, here we further reduce the warnings weget about local variables being shadowed when building with-Wshadow=compatible-local. This small change reduces the overall numberof warnings by 36.Discussion:https://postgr.es/m/CAApHDvqBBqF=wmV5azrO7h3VwpwQo+JFBQ+g=E6wVUhKcqR8gA@mail.gmail.com

1 parentf01592f commit92fce4eCopy full SHA for 92fce4e

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,22 +56,22 @@`
`56`	`56`
`57`	`57`	`#defineEXPECT_EQ_U32(result_expr,expected_expr)\`
`58`	`58`	`do { \`
`59`		`-uint32result = (result_expr); \`
`60`		`-uint32expected = (expected_expr); \`
`61`		`-if (result !=expected) \`
	`59`	`+uint32actual_result = (result_expr); \`
	`60`	`+uint32expected_result = (expected_expr); \`
	`61`	`+if (actual_result !=expected_result) \`
`62`	`62`	`elog(ERROR, \`
`63`	`63`	`"%s yielded %u, expected %s in file \"%s\" line %u", \`
`64`		`- #result_expr,result, #expected_expr, __FILE__, __LINE__); \`
	`64`	`+ #result_expr,actual_result, #expected_expr, __FILE__, __LINE__); \`
`65`	`65`	`} while (0)`
`66`	`66`
`67`	`67`	`#defineEXPECT_EQ_U64(result_expr,expected_expr)\`
`68`	`68`	`do { \`
`69`		`-uint64result = (result_expr); \`
`70`		`-uint64expected = (expected_expr); \`
`71`		`-if (result !=expected) \`
	`69`	`+uint64actual_result = (result_expr); \`
	`70`	`+uint64expected_result = (expected_expr); \`
	`71`	`+if (actual_result !=expected_result) \`
`72`	`72`	`elog(ERROR, \`
`73`	`73`	`"%s yielded " UINT64_FORMAT ", expected %s in file \"%s\" line %u", \`
`74`		`- #result_expr,result, #expected_expr, __FILE__, __LINE__); \`
	`74`	`+ #result_expr,actual_result, #expected_expr, __FILE__, __LINE__); \`
`75`	`75`	`} while (0)`
`76`	`76`
`77`	`77`	`#defineLDELIM'('`

Comments

(0)