diff options
| author | David Rowley <drowley@postgresql.org> | 2022-08-20 15:16:51 +1200 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2022-08-20 15:16:51 +1200 |
| commit | 92fce4e1eda9b24d73f583fbe9b58f4e03f097a4 (patch) | |
| tree | 4c5736e8722a19bd5a2c34ac6eb44e28665c290b /src | |
| parent | f01592f9157707c4de1f00a0e0dc5a7e8fa8f1d5 (diff) | |
| download | postgresql-92fce4e1eda9b24d73f583fbe9b58f4e03f097a4.tar.gz postgresql-92fce4e1eda9b24d73f583fbe9b58f4e03f097a4.zip | |
Reduce warnings with -Wshadow=compatible-local builds
In a similar effort to f01592f91, here we further reduce the warnings we
get about local variables being shadowed when building with
-Wshadow=compatible-local. This small change reduces the overall number
of warnings by 36.
Discussion: https://postgr.es/m/CAApHDvqBBqF=wmV5azrO7h3VwpwQo+JFBQ+g=E6wVUhKcqR8gA@mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/regress.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index b88d70b6fcc..78dde978498 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -56,22 +56,22 @@ #define EXPECT_EQ_U32(result_expr, expected_expr) \ do { \ - uint32 result = (result_expr); \ - uint32 expected = (expected_expr); \ - if (result != expected) \ + uint32 actual_result = (result_expr); \ + uint32 expected_result = (expected_expr); \ + if (actual_result != expected_result) \ elog(ERROR, \ "%s yielded %u, expected %s in file \"%s\" line %u", \ - #result_expr, result, #expected_expr, __FILE__, __LINE__); \ + #result_expr, actual_result, #expected_expr, __FILE__, __LINE__); \ } while (0) #define EXPECT_EQ_U64(result_expr, expected_expr) \ do { \ - uint64 result = (result_expr); \ - uint64 expected = (expected_expr); \ - if (result != expected) \ + uint64 actual_result = (result_expr); \ + uint64 expected_result = (expected_expr); \ + if (actual_result != expected_result) \ elog(ERROR, \ "%s yielded " UINT64_FORMAT ", expected %s in file \"%s\" line %u", \ - #result_expr, result, #expected_expr, __FILE__, __LINE__); \ + #result_expr, actual_result, #expected_expr, __FILE__, __LINE__); \ } while (0) #define LDELIM '(' |